From b81613e5e57fd208e832637b6886abf9ec806c4b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 12:25:28 -0400
Subject: [ticket/11700] With namespaces interface will no longer be a valid
 classname

PHPBB3-11700
---
 phpBB/phpbb/auth/provider/interface.php            | 105 ------------
 phpBB/phpbb/auth/provider/provider_interface.php   | 105 ++++++++++++
 phpBB/phpbb/avatar/driver/driver_interface.php     | 116 +++++++++++++
 phpBB/phpbb/avatar/driver/interface.php            | 116 -------------
 phpBB/phpbb/cache/driver/driver_interface.php      | 144 ++++++++++++++++
 phpBB/phpbb/cache/driver/interface.php             | 144 ----------------
 phpBB/phpbb/db/migration/tool/interface.php        |  33 ----
 phpBB/phpbb/db/migration/tool/tool_interface.php   |  33 ++++
 phpBB/phpbb/extension/extension_interface.php      |  67 ++++++++
 phpBB/phpbb/extension/interface.php                |  67 --------
 .../groupposition/groupposition_interface.php      |  84 +++++++++
 phpBB/phpbb/groupposition/interface.php            |  84 ---------
 phpBB/phpbb/log/interface.php                      | 106 ------------
 phpBB/phpbb/log/log_interface.php                  | 106 ++++++++++++
 phpBB/phpbb/notification/method/interface.php      |  48 ------
 .../phpbb/notification/method/method_interface.php |  48 ++++++
 phpBB/phpbb/notification/type/interface.php        | 189 ---------------------
 phpBB/phpbb/notification/type/type_interface.php   | 189 +++++++++++++++++++++
 phpBB/phpbb/request/interface.php                  | 139 ---------------
 phpBB/phpbb/request/request_interface.php          | 139 +++++++++++++++
 phpBB/phpbb/tree/interface.php                     | 122 -------------
 phpBB/phpbb/tree/tree_interface.php                | 122 +++++++++++++
 22 files changed, 1153 insertions(+), 1153 deletions(-)
 delete mode 100644 phpBB/phpbb/auth/provider/interface.php
 create mode 100644 phpBB/phpbb/auth/provider/provider_interface.php
 create mode 100644 phpBB/phpbb/avatar/driver/driver_interface.php
 delete mode 100644 phpBB/phpbb/avatar/driver/interface.php
 create mode 100644 phpBB/phpbb/cache/driver/driver_interface.php
 delete mode 100644 phpBB/phpbb/cache/driver/interface.php
 delete mode 100644 phpBB/phpbb/db/migration/tool/interface.php
 create mode 100644 phpBB/phpbb/db/migration/tool/tool_interface.php
 create mode 100644 phpBB/phpbb/extension/extension_interface.php
 delete mode 100644 phpBB/phpbb/extension/interface.php
 create mode 100644 phpBB/phpbb/groupposition/groupposition_interface.php
 delete mode 100644 phpBB/phpbb/groupposition/interface.php
 delete mode 100644 phpBB/phpbb/log/interface.php
 create mode 100644 phpBB/phpbb/log/log_interface.php
 delete mode 100644 phpBB/phpbb/notification/method/interface.php
 create mode 100644 phpBB/phpbb/notification/method/method_interface.php
 delete mode 100644 phpBB/phpbb/notification/type/interface.php
 create mode 100644 phpBB/phpbb/notification/type/type_interface.php
 delete mode 100644 phpBB/phpbb/request/interface.php
 create mode 100644 phpBB/phpbb/request/request_interface.php
 delete mode 100644 phpBB/phpbb/tree/interface.php
 create mode 100644 phpBB/phpbb/tree/tree_interface.php

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/auth/provider/interface.php b/phpBB/phpbb/auth/provider/interface.php
deleted file mode 100644
index 47043bc107..0000000000
--- a/phpBB/phpbb/auth/provider/interface.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * The interface authentication provider classes have to implement.
- *
- * @package auth
- */
-interface phpbb_auth_provider_interface
-{
-	/**
-	 * Checks whether the user is currently identified to the authentication
-	 * provider.
-	 * Called in acp_board while setting authentication plugins.
-	 * Changing to an authentication provider will not be permitted in acp_board
-	 * if there is an error.
-	 *
-	 * @return 	boolean|string 	False if the user is identified, otherwise an
-	 *							error message, or null if not implemented.
-	 */
-	public function init();
-
-	/**
-	 * Performs login.
-	 *
-	 * @param	string	$username 	The name of the user being authenticated.
-	 * @param	string	$password	The password of the user.
-	 * @return	array	An associative array of the format:
-	 *						array(
-	 *							'status' => status constant
-	 *							'error_msg' => string
-	 *							'user_row' => array
-	 *						)
-	 */
-	public function login($username, $password);
-
-	/**
-	 * Autologin function
-	 *
-	 * @return 	array|null	containing the user row, empty if no auto login
-	 * 						should take place, or null if not impletmented.
-	 */
-	public function autologin();
-
-	/**
-	 * This function is used to output any required fields in the authentication
-	 * admin panel. It also defines any required configuration table fields.
-	 *
-	 * @return	array|null	Returns null if not implemented or an array of the
-	 *						configuration fields of the provider.
-	 */
-	public function acp();
-
-	/**
-	 * This function updates the template with variables related to the acp
-	 * options with whatever configuraton values are passed to it as an array.
-	 * It then returns the name of the acp file related to this authentication
-	 * provider.
-	 * @param	array	$new_config Contains the new configuration values that
-	 *								have been set in acp_board.
-	 * @return	array|null		Returns null if not implemented or an array with
-	 *							the template file name and an array of the vars
-	 *							that the template needs that must conform to the
-	 *							following example:
-	 *							array(
-	 *								'TEMPLATE_FILE'	=> string,
-	 *								'TEMPLATE_VARS'	=> array(...),
-	 *							)
-	 */
-	public function get_acp_template($new_config);
-
-	/**
-	 * Performs additional actions during logout.
-	 *
-	 * @param 	array	$data			An array corresponding to
-	 *									phpbb_session::data
-	 * @param 	boolean	$new_session	True for a new session, false for no new
-	 *									session.
-	 */
-	public function logout($data, $new_session);
-
-	/**
-	 * The session validation function checks whether the user is still logged
-	 * into phpBB.
-	 *
-	 * @param 	array 	$user
-	 * @return 	boolean	true if the given user is authenticated, false if the 
-	 * 					session should be closed, or null if not implemented.
-	 */
-	public function validate_session($user);
-}
diff --git a/phpBB/phpbb/auth/provider/provider_interface.php b/phpBB/phpbb/auth/provider/provider_interface.php
new file mode 100644
index 0000000000..baf55c7a86
--- /dev/null
+++ b/phpBB/phpbb/auth/provider/provider_interface.php
@@ -0,0 +1,105 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * The interface authentication provider classes have to implement.
+ *
+ * @package auth
+ */
+interface phpbb_auth_provider_provider_interface
+{
+	/**
+	 * Checks whether the user is currently identified to the authentication
+	 * provider.
+	 * Called in acp_board while setting authentication plugins.
+	 * Changing to an authentication provider will not be permitted in acp_board
+	 * if there is an error.
+	 *
+	 * @return 	boolean|string 	False if the user is identified, otherwise an
+	 *							error message, or null if not implemented.
+	 */
+	public function init();
+
+	/**
+	 * Performs login.
+	 *
+	 * @param	string	$username 	The name of the user being authenticated.
+	 * @param	string	$password	The password of the user.
+	 * @return	array	An associative array of the format:
+	 *						array(
+	 *							'status' => status constant
+	 *							'error_msg' => string
+	 *							'user_row' => array
+	 *						)
+	 */
+	public function login($username, $password);
+
+	/**
+	 * Autologin function
+	 *
+	 * @return 	array|null	containing the user row, empty if no auto login
+	 * 						should take place, or null if not impletmented.
+	 */
+	public function autologin();
+
+	/**
+	 * This function is used to output any required fields in the authentication
+	 * admin panel. It also defines any required configuration table fields.
+	 *
+	 * @return	array|null	Returns null if not implemented or an array of the
+	 *						configuration fields of the provider.
+	 */
+	public function acp();
+
+	/**
+	 * This function updates the template with variables related to the acp
+	 * options with whatever configuraton values are passed to it as an array.
+	 * It then returns the name of the acp file related to this authentication
+	 * provider.
+	 * @param	array	$new_config Contains the new configuration values that
+	 *								have been set in acp_board.
+	 * @return	array|null		Returns null if not implemented or an array with
+	 *							the template file name and an array of the vars
+	 *							that the template needs that must conform to the
+	 *							following example:
+	 *							array(
+	 *								'TEMPLATE_FILE'	=> string,
+	 *								'TEMPLATE_VARS'	=> array(...),
+	 *							)
+	 */
+	public function get_acp_template($new_config);
+
+	/**
+	 * Performs additional actions during logout.
+	 *
+	 * @param 	array	$data			An array corresponding to
+	 *									phpbb_session::data
+	 * @param 	boolean	$new_session	True for a new session, false for no new
+	 *									session.
+	 */
+	public function logout($data, $new_session);
+
+	/**
+	 * The session validation function checks whether the user is still logged
+	 * into phpBB.
+	 *
+	 * @param 	array 	$user
+	 * @return 	boolean	true if the given user is authenticated, false if the
+	 * 					session should be closed, or null if not implemented.
+	 */
+	public function validate_session($user);
+}
diff --git a/phpBB/phpbb/avatar/driver/driver_interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php
new file mode 100644
index 0000000000..0a44a7a1fe
--- /dev/null
+++ b/phpBB/phpbb/avatar/driver/driver_interface.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Interface for avatar drivers
+* @package phpBB3
+*/
+interface phpbb_avatar_driver_driver_interface
+{
+	/**
+	* Returns the name of the driver.
+	*
+	* @return string	Name of driver.
+	*/
+	public function get_name();
+
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param array	$row User data or group data that has been cleaned with
+	*        phpbb_avatar_manager::clean_row
+	* @return array Avatar data, must have keys src, width and height, e.g.
+	*        ['src' => '', 'width' => 0, 'height' => 0]
+	*/
+	public function get_data($row);
+
+	/**
+	* Returns custom html if it is needed for displaying this avatar
+	*
+	* @param phpbb_user $user phpBB user object
+	* @param array	$row User data or group data that has been cleaned with
+	*        phpbb_avatar_manager::clean_row
+	* @param string $alt Alternate text for avatar image
+	*
+	* @return string HTML
+	*/
+	public function get_custom_html($user, $row, $alt = '');
+
+	/**
+	* Prepare form for changing the settings of this avatar
+	*
+	* @param phpbb_request $request Request object
+	* @param phpbb_template	$template Template object
+	* @param phpbb_user $user User object
+	* @param array	$row User data or group data that has been cleaned with
+	*        phpbb_avatar_manager::clean_row
+	* @param array	&$error Reference to an error array that is filled by this
+	*        function. Key values can either be a string with a language key or
+	*        an array that will be passed to vsprintf() with the language key in
+	*        the first array key.
+	*
+	* @return bool True if form has been successfully prepared
+	*/
+	public function prepare_form($request, $template, $user, $row, &$error);
+
+	/**
+	* Prepare form for changing the acp settings of this avatar
+	*
+	* @param phpbb_user $user phpBB user object
+	*
+	* @return array Array of configuration options as consumed by acp_board.
+	*        The setting for enabling/disabling the avatar will be handled by
+	*        the avatar manager.
+	*/
+	public function prepare_form_acp($user);
+
+	/**
+	* Process form data
+	*
+	* @param phpbb_request $request Request object
+	* @param phpbb_template	$template Template object
+	* @param phpbb_user $user User object
+	* @param array	$row User data or group data that has been cleaned with
+	*        phpbb_avatar_manager::clean_row
+	* @param array	&$error Reference to an error array that is filled by this
+	*        function. Key values can either be a string with a language key or
+	*        an array that will be passed to vsprintf() with the language key in
+	*        the first array key.
+	*
+	* @return array Array containing the avatar data as follows:
+	*        ['avatar'], ['avatar_width'], ['avatar_height']
+	*/
+	public function process_form($request, $template, $user, $row, &$error);
+
+	/**
+	* Delete avatar
+	*
+	* @param array $row User data or group data that has been cleaned with
+	*        phpbb_avatar_manager::clean_row
+	*
+	* @return bool True if avatar has been deleted or there is no need to delete,
+	*        i.e. when the avatar is not hosted locally.
+	*/
+	public function delete($row);
+
+	/**
+	* Get the avatar driver's template name
+	*
+	* @return string Avatar driver's template name
+	*/
+	public function get_template_name();
+}
diff --git a/phpBB/phpbb/avatar/driver/interface.php b/phpBB/phpbb/avatar/driver/interface.php
deleted file mode 100644
index 3d62969aef..0000000000
--- a/phpBB/phpbb/avatar/driver/interface.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Interface for avatar drivers
-* @package phpBB3
-*/
-interface phpbb_avatar_driver_interface
-{
-	/**
-	* Returns the name of the driver.
-	*
-	* @return string	Name of driver.
-	*/
-	public function get_name();
-
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @return array Avatar data, must have keys src, width and height, e.g.
-	*        ['src' => '', 'width' => 0, 'height' => 0]
-	*/
-	public function get_data($row);
-
-	/**
-	* Returns custom html if it is needed for displaying this avatar
-	*
-	* @param phpbb_user $user phpBB user object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param string $alt Alternate text for avatar image
-	*
-	* @return string HTML
-	*/
-	public function get_custom_html($user, $row, $alt = '');
-
-	/**
-	* Prepare form for changing the settings of this avatar
-	*
-	* @param phpbb_request $request Request object
-	* @param phpbb_template	$template Template object
-	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array that is filled by this
-	*        function. Key values can either be a string with a language key or
-	*        an array that will be passed to vsprintf() with the language key in
-	*        the first array key.
-	*
-	* @return bool True if form has been successfully prepared
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error);
-
-	/**
-	* Prepare form for changing the acp settings of this avatar
-	*
-	* @param phpbb_user $user phpBB user object
-	*
-	* @return array Array of configuration options as consumed by acp_board.
-	*        The setting for enabling/disabling the avatar will be handled by
-	*        the avatar manager.
-	*/
-	public function prepare_form_acp($user);
-
-	/**
-	* Process form data
-	*
-	* @param phpbb_request $request Request object
-	* @param phpbb_template	$template Template object
-	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array that is filled by this
-	*        function. Key values can either be a string with a language key or
-	*        an array that will be passed to vsprintf() with the language key in
-	*        the first array key.
-	*
-	* @return array Array containing the avatar data as follows:
-	*        ['avatar'], ['avatar_width'], ['avatar_height']
-	*/
-	public function process_form($request, $template, $user, $row, &$error);
-
-	/**
-	* Delete avatar
-	*
-	* @param array $row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	*
-	* @return bool True if avatar has been deleted or there is no need to delete,
-	*        i.e. when the avatar is not hosted locally.
-	*/
-	public function delete($row);
-
-	/**
-	* Get the avatar driver's template name
-	*
-	* @return string Avatar driver's template name
-	*/
-	public function get_template_name();
-}
diff --git a/phpBB/phpbb/cache/driver/driver_interface.php b/phpBB/phpbb/cache/driver/driver_interface.php
new file mode 100644
index 0000000000..34028b82e2
--- /dev/null
+++ b/phpBB/phpbb/cache/driver/driver_interface.php
@@ -0,0 +1,144 @@
+<?php
+/**
+*
+* @package acm
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* An interface that all cache drivers must implement
+*
+* @package acm
+*/
+interface phpbb_cache_driver_driver_interface
+{
+	/**
+	* Load global cache
+	*/
+	public function load();
+
+	/**
+	* Unload cache object
+	*/
+	public function unload();
+
+	/**
+	* Save modified objects
+	*/
+	public function save();
+
+	/**
+	* Tidy cache
+	*/
+	public function tidy();
+
+	/**
+	* Get saved cache object
+	*/
+	public function get($var_name);
+
+	/**
+	* Put data into cache
+	*/
+	public function put($var_name, $var, $ttl = 0);
+
+	/**
+	* Purge cache data
+	*/
+	public function purge();
+
+	/**
+	* Destroy cache data
+	*/
+	public function destroy($var_name, $table = '');
+
+	/**
+	* Check if a given cache entry exists
+	*/
+	public function _exists($var_name);
+
+	/**
+	* Load result of an SQL query from cache.
+	*
+	* @param string $query			SQL query
+	*
+	* @return int|bool				Query ID (integer) if cache contains a rowset
+	*								for the specified query.
+	*								False otherwise.
+	*/
+	public function sql_load($query);
+
+	/**
+	* Save result of an SQL query in cache.
+	*
+	* In persistent cache stores, this function stores the query
+	* result to persistent storage. In other words, there is no need
+	* to call save() afterwards.
+	*
+	* @param phpbb_db_driver $db	Database connection
+	* @param string $query			SQL query, should be used for generating storage key
+	* @param mixed $query_result	The result from dbal::sql_query, to be passed to
+	* 								dbal::sql_fetchrow to get all rows and store them
+	* 								in cache.
+	* @param int $ttl				Time to live, after this timeout the query should
+	*								expire from the cache.
+	* @return int|mixed				If storing in cache succeeded, an integer $query_id
+	* 								representing the query should be returned. Otherwise
+	* 								the original $query_result should be returned.
+	*/
+	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl);
+
+	/**
+	* Check if result for a given SQL query exists in cache.
+	*
+	* @param int $query_id
+	* @return bool
+	*/
+	public function sql_exists($query_id);
+
+	/**
+	* Fetch row from cache (database)
+	*
+	* @param int $query_id
+	* @return array|bool 			The query result if found in the cache, otherwise
+	* 								false.
+	*/
+	public function sql_fetchrow($query_id);
+
+	/**
+	* Fetch a field from the current row of a cached database result (database)
+	*
+	* @param int $query_id
+	* @param $field 				The name of the column.
+	* @return string|bool 			The field of the query result if found in the cache,
+	* 								otherwise false.
+	*/
+	public function sql_fetchfield($query_id, $field);
+
+	/**
+	* Seek a specific row in an a cached database result (database)
+	*
+	* @param int $rownum 			Row to seek to.
+	* @param int $query_id
+	* @return bool
+	*/
+	public function sql_rowseek($rownum, $query_id);
+
+	/**
+	* Free memory used for a cached database result (database)
+	*
+	* @param int $query_id
+	* @return bool
+	*/
+	public function sql_freeresult($query_id);
+}
diff --git a/phpBB/phpbb/cache/driver/interface.php b/phpBB/phpbb/cache/driver/interface.php
deleted file mode 100644
index 53f684d1c8..0000000000
--- a/phpBB/phpbb/cache/driver/interface.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* An interface that all cache drivers must implement
-*
-* @package acm
-*/
-interface phpbb_cache_driver_interface
-{
-	/**
-	* Load global cache
-	*/
-	public function load();
-
-	/**
-	* Unload cache object
-	*/
-	public function unload();
-
-	/**
-	* Save modified objects
-	*/
-	public function save();
-
-	/**
-	* Tidy cache
-	*/
-	public function tidy();
-
-	/**
-	* Get saved cache object
-	*/
-	public function get($var_name);
-
-	/**
-	* Put data into cache
-	*/
-	public function put($var_name, $var, $ttl = 0);
-
-	/**
-	* Purge cache data
-	*/
-	public function purge();
-
-	/**
-	* Destroy cache data
-	*/
-	public function destroy($var_name, $table = '');
-
-	/**
-	* Check if a given cache entry exists
-	*/
-	public function _exists($var_name);
-
-	/**
-	* Load result of an SQL query from cache.
-	*
-	* @param string $query			SQL query
-	*
-	* @return int|bool				Query ID (integer) if cache contains a rowset
-	*								for the specified query.
-	*								False otherwise.
-	*/
-	public function sql_load($query);
-
-	/**
-	* Save result of an SQL query in cache.
-	*
-	* In persistent cache stores, this function stores the query
-	* result to persistent storage. In other words, there is no need
-	* to call save() afterwards.
-	*
-	* @param phpbb_db_driver $db	Database connection
-	* @param string $query			SQL query, should be used for generating storage key
-	* @param mixed $query_result	The result from dbal::sql_query, to be passed to
-	* 								dbal::sql_fetchrow to get all rows and store them
-	* 								in cache.
-	* @param int $ttl				Time to live, after this timeout the query should
-	*								expire from the cache.
-	* @return int|mixed				If storing in cache succeeded, an integer $query_id
-	* 								representing the query should be returned. Otherwise
-	* 								the original $query_result should be returned.
-	*/
-	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl);
-
-	/**
-	* Check if result for a given SQL query exists in cache.
-	*
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_exists($query_id);
-
-	/**
-	* Fetch row from cache (database)
-	*
-	* @param int $query_id
-	* @return array|bool 			The query result if found in the cache, otherwise
-	* 								false.
-	*/
-	public function sql_fetchrow($query_id);
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*
-	* @param int $query_id
-	* @param $field 				The name of the column.
-	* @return string|bool 			The field of the query result if found in the cache,
-	* 								otherwise false.
-	*/
-	public function sql_fetchfield($query_id, $field);
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*
-	* @param int $rownum 			Row to seek to.
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_rowseek($rownum, $query_id);
-
-	/**
-	* Free memory used for a cached database result (database)
-	*
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_freeresult($query_id);
-}
diff --git a/phpBB/phpbb/db/migration/tool/interface.php b/phpBB/phpbb/db/migration/tool/interface.php
deleted file mode 100644
index ced53b2023..0000000000
--- a/phpBB/phpbb/db/migration/tool/interface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* Migration tool interface
-*
-* @package db
-*/
-interface phpbb_db_migration_tool_interface
-{
-	/**
-	* Retrieve a short name used for commands in migrations.
-	*
-	* @return string short name
-	*/
-	public function get_name();
-
-	/**
-	* Reverse an original install action
-	*
-	* First argument is the original call to the class (e.g. add, remove)
-	* After the first argument, send the original arguments to the function in the original call
-	*
-	* @return null
-	*/
-	public function reverse();
-}
diff --git a/phpBB/phpbb/db/migration/tool/tool_interface.php b/phpBB/phpbb/db/migration/tool/tool_interface.php
new file mode 100644
index 0000000000..72344d50d2
--- /dev/null
+++ b/phpBB/phpbb/db/migration/tool/tool_interface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* Migration tool interface
+*
+* @package db
+*/
+interface phpbb_db_migration_tool_tool_interface
+{
+	/**
+	* Retrieve a short name used for commands in migrations.
+	*
+	* @return string short name
+	*/
+	public function get_name();
+
+	/**
+	* Reverse an original install action
+	*
+	* First argument is the original call to the class (e.g. add, remove)
+	* After the first argument, send the original arguments to the function in the original call
+	*
+	* @return null
+	*/
+	public function reverse();
+}
diff --git a/phpBB/phpbb/extension/extension_interface.php b/phpBB/phpbb/extension/extension_interface.php
new file mode 100644
index 0000000000..b922499738
--- /dev/null
+++ b/phpBB/phpbb/extension/extension_interface.php
@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* @package extension
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The interface extension meta classes have to implement to run custom code
+* on enable/disable/purge.
+*
+* @package extension
+*/
+interface phpbb_extension_extension_interface
+{
+	/**
+	* enable_step is executed on enabling an extension until it returns false.
+	*
+	* Calls to this function can be made in subsequent requests, when the
+	* function is invoked through a webserver with a too low max_execution_time.
+	*
+	* @param	mixed	$old_state	The return value of the previous call
+	*								of this method, or false on the first call
+	* @return	mixed				Returns false after last step, otherwise
+	*								temporary state which is passed as an
+	*								argument to the next step
+	*/
+	public function enable_step($old_state);
+
+	/**
+	* Disables the extension.
+	*
+	* Calls to this function can be made in subsequent requests, when the
+	* function is invoked through a webserver with a too low max_execution_time.
+	*
+	* @param	mixed	$old_state	The return value of the previous call
+	*								of this method, or false on the first call
+	* @return	mixed				Returns false after last step, otherwise
+	*								temporary state which is passed as an
+	*								argument to the next step
+	*/
+	public function disable_step($old_state);
+
+	/**
+	* purge_step is executed on purging an extension until it returns false.
+	*
+	* Calls to this function can be made in subsequent requests, when the
+	* function is invoked through a webserver with a too low max_execution_time.
+	*
+	* @param	mixed	$old_state	The return value of the previous call
+	*								of this method, or false on the first call
+	* @return	mixed				Returns false after last step, otherwise
+	*								temporary state which is passed as an
+	*								argument to the next step
+	*/
+	public function purge_step($old_state);
+}
diff --git a/phpBB/phpbb/extension/interface.php b/phpBB/phpbb/extension/interface.php
deleted file mode 100644
index 7b36a12bf6..0000000000
--- a/phpBB/phpbb/extension/interface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The interface extension meta classes have to implement to run custom code
-* on enable/disable/purge.
-*
-* @package extension
-*/
-interface phpbb_extension_interface
-{
-	/**
-	* enable_step is executed on enabling an extension until it returns false.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function enable_step($old_state);
-
-	/**
-	* Disables the extension.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function disable_step($old_state);
-
-	/**
-	* purge_step is executed on purging an extension until it returns false.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function purge_step($old_state);
-}
diff --git a/phpBB/phpbb/groupposition/groupposition_interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php
new file mode 100644
index 0000000000..0f29984588
--- /dev/null
+++ b/phpBB/phpbb/groupposition/groupposition_interface.php
@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Interface to manage group positions in various places of phpbb
+*
+* The interface provides simple methods to add, delete and move a group
+*
+* @package phpBB3
+*/
+interface phpbb_groupposition_groupposition_interface
+{
+	/**
+	* Returns the value for a given group, if the group exists.
+	* @param	int		$group_id	group_id of the group to be selected
+	* @return	int			position of the group
+	*/
+	public function get_group_value($group_id);
+
+	/**
+	* Get number of groups displayed
+	*
+	* @return	int		value of the last item displayed
+	*/
+	public function get_group_count();
+
+	/**
+	* Addes a group by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be added
+	* @return	bool		True if the group was added successfully
+	*/
+	public function add_group($group_id);
+
+	/**
+	* Deletes a group by group_id
+	*
+	* @param	int		$group_id		group_id of the group to be deleted
+	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
+	* @return	bool		True if the group was deleted successfully
+	*/
+	public function delete_group($group_id, $skip_group = false);
+
+	/**
+	* Moves a group up by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	bool		True if the group was moved successfully
+	*/
+	public function move_up($group_id);
+
+	/**
+	* Moves a group down by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	bool		True if the group was moved successfully
+	*/
+	public function move_down($group_id);
+
+	/**
+	* Moves a group up/down
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @param	int		$delta		number of steps:
+	*								- positive = move up
+	*								- negative = move down
+	* @return	bool		True if the group was moved successfully
+	*/
+	public function move($group_id, $delta);
+}
diff --git a/phpBB/phpbb/groupposition/interface.php b/phpBB/phpbb/groupposition/interface.php
deleted file mode 100644
index eacc04e1a4..0000000000
--- a/phpBB/phpbb/groupposition/interface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Interface to manage group positions in various places of phpbb
-*
-* The interface provides simple methods to add, delete and move a group
-*
-* @package phpBB3
-*/
-interface phpbb_groupposition_interface
-{
-	/**
-	* Returns the value for a given group, if the group exists.
-	* @param	int		$group_id	group_id of the group to be selected
-	* @return	int			position of the group
-	*/
-	public function get_group_value($group_id);
-
-	/**
-	* Get number of groups displayed 
-	*
-	* @return	int		value of the last item displayed
-	*/
-	public function get_group_count();
-
-	/**
-	* Addes a group by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be added
-	* @return	bool		True if the group was added successfully
-	*/
-	public function add_group($group_id);
-
-	/**
-	* Deletes a group by group_id
-	*
-	* @param	int		$group_id		group_id of the group to be deleted
-	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
-	* @return	bool		True if the group was deleted successfully
-	*/
-	public function delete_group($group_id, $skip_group = false);
-
-	/**
-	* Moves a group up by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_up($group_id);
-
-	/**
-	* Moves a group down by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_down($group_id);
-
-	/**
-	* Moves a group up/down
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @param	int		$delta		number of steps:
-	*								- positive = move up
-	*								- negative = move down
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move($group_id, $delta);
-}
diff --git a/phpBB/phpbb/log/interface.php b/phpBB/phpbb/log/interface.php
deleted file mode 100644
index 3b459c9bdf..0000000000
--- a/phpBB/phpbb/log/interface.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_log
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The interface for the log-system.
-*
-* @package phpbb_log
-*/
-interface phpbb_log_interface
-{
-	/**
-	* This function returns the state of the log system.
-	*
-	* @param	string	$type	The log type we want to check. Empty to get
-	*							global log status.
-	*
-	* @return	bool	True if log for the type is enabled
-	*/
-	public function is_enabled($type = '');
-
-	/**
-	* Disable log
-	*
-	* This function allows disabling the log system or parts of it, for this
-	* page call. When add_log is called and the type is disabled,
-	* the log will not be added to the database.
-	*
-	* @param	mixed	$type	The log type we want to disable. Empty to
-	*						disable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function disable($type = '');
-
-	/**
-	* Enable log
-	*
-	* This function allows re-enabling the log system.
-	*
-	* @param	mixed	$type	The log type we want to enable. Empty to
-	*						enable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function enable($type = '');
-
-	/**
-	* Adds a log entry to the database
-	*
-	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
-	* @param	int		$user_id			User ID of the user
-	* @param	string	$log_ip				IP address of the user
-	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
-	* @param	array	$additional_data	More arguments can be added, depending on the log_type
-	*
-	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
-	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
-
-	/**
-	* Grab the logs from the database
-	*
-	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
-	* @param	bool	$count_logs		Shall we count all matching log entries?
-	* @param	int		$limit			Limit the number of entries that are returned
-	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
-	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
-	* @param	int		$topic_id		Restrict the log entries to the given topic_id
-	* @param	int		$user_id		Restrict the log entries to the given user_id
-	* @param	int		$log_time		Only get log entries newer than the given timestamp
-	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
-	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
-	*
-	* @return	array			The result array with the logs
-	*/
-	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
-
-	/**
-	* Get total log count
-	*
-	* @return	int			Returns the number of matching logs from the last call to get_logs()
-	*/
-	public function get_log_count();
-
-	/**
-	* Get offset of the last valid page
-	*
-	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
-	*/
-	public function get_valid_offset();
-}
diff --git a/phpBB/phpbb/log/log_interface.php b/phpBB/phpbb/log/log_interface.php
new file mode 100644
index 0000000000..2d41c9994f
--- /dev/null
+++ b/phpBB/phpbb/log/log_interface.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package phpbb_log
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The interface for the log-system.
+*
+* @package phpbb_log
+*/
+interface phpbb_log_log_interface
+{
+	/**
+	* This function returns the state of the log system.
+	*
+	* @param	string	$type	The log type we want to check. Empty to get
+	*							global log status.
+	*
+	* @return	bool	True if log for the type is enabled
+	*/
+	public function is_enabled($type = '');
+
+	/**
+	* Disable log
+	*
+	* This function allows disabling the log system or parts of it, for this
+	* page call. When add_log is called and the type is disabled,
+	* the log will not be added to the database.
+	*
+	* @param	mixed	$type	The log type we want to disable. Empty to
+	*						disable all logs. Can also be an array of types.
+	*
+	* @return	null
+	*/
+	public function disable($type = '');
+
+	/**
+	* Enable log
+	*
+	* This function allows re-enabling the log system.
+	*
+	* @param	mixed	$type	The log type we want to enable. Empty to
+	*						enable all logs. Can also be an array of types.
+	*
+	* @return	null
+	*/
+	public function enable($type = '');
+
+	/**
+	* Adds a log entry to the database
+	*
+	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
+	* @param	int		$user_id			User ID of the user
+	* @param	string	$log_ip				IP address of the user
+	* @param	string	$log_operation		Name of the operation
+	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
+	* @param	array	$additional_data	More arguments can be added, depending on the log_type
+	*
+	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+	*/
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
+
+	/**
+	* Grab the logs from the database
+	*
+	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
+	* @param	bool	$count_logs		Shall we count all matching log entries?
+	* @param	int		$limit			Limit the number of entries that are returned
+	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
+	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
+	* @param	int		$topic_id		Restrict the log entries to the given topic_id
+	* @param	int		$user_id		Restrict the log entries to the given user_id
+	* @param	int		$log_time		Only get log entries newer than the given timestamp
+	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
+	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
+	*
+	* @return	array			The result array with the logs
+	*/
+	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
+
+	/**
+	* Get total log count
+	*
+	* @return	int			Returns the number of matching logs from the last call to get_logs()
+	*/
+	public function get_log_count();
+
+	/**
+	* Get offset of the last valid page
+	*
+	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
+	*/
+	public function get_valid_offset();
+}
diff --git a/phpBB/phpbb/notification/method/interface.php b/phpBB/phpbb/notification/method/interface.php
deleted file mode 100644
index ef875942cc..0000000000
--- a/phpBB/phpbb/notification/method/interface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications method interface
-* @package notifications
-*/
-interface phpbb_notification_method_interface
-{
-	/**
-	* Get notification method name
-	*
-	* @return string
-	*/
-	public function get_type();
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available();
-
-	/**
-	* Add a notification to the queue
-	*
-	* @param phpbb_notification_type_interface $notification
-	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification);
-
-	/**
-	* Parse the queue and notify the users
-	*/
-	public function notify();
-}
diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php
new file mode 100644
index 0000000000..b3ca757d5f
--- /dev/null
+++ b/phpBB/phpbb/notification/method/method_interface.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method interface
+* @package notifications
+*/
+interface phpbb_notification_method_method_interface
+{
+	/**
+	* Get notification method name
+	*
+	* @return string
+	*/
+	public function get_type();
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available();
+
+	/**
+	* Add a notification to the queue
+	*
+	* @param phpbb_notification_type_interface $notification
+	*/
+	public function add_to_queue(phpbb_notification_type_interface $notification);
+
+	/**
+	* Parse the queue and notify the users
+	*/
+	public function notify();
+}
diff --git a/phpBB/phpbb/notification/type/interface.php b/phpBB/phpbb/notification/type/interface.php
deleted file mode 100644
index a40fdafd09..0000000000
--- a/phpBB/phpbb/notification/type/interface.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications interface
-* @package notifications
-*/
-interface phpbb_notification_type_interface
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type();
-	
-	/**
-	* Set initial data from the database
-	*
-	* @param array $data Row directly from the database
-	*/
-	public function set_initial_data($data);
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $type_data The type specific data
-	*/
-	public static function get_item_id($type_data);
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $type_data The type specific data
-	*/
-	public static function get_item_parent_id($type_data);
-
-	/**
-	* 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();
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $type_data The type specific data
-	* @param array $options Options for finding users for notification
-	* 		ignore_users => array of users and user types that should not receive notifications from this type because they've already been notified
-	* 						e.g.: array(2 => array(''), 3 => array('', 'email'), ...)
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($type_data, $options);
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query();
-
-	/**
-	* Get the special items to load
-	*
-	* @return array Data will be combined sent to load_special() so you can run a single query and get data required for this notification type
-	*/
-	public function get_load_special();
-
-	/**
-	* Load the special items
-	*
-	* @param array $data Data from get_load_special()
-	* @param array $notifications Array of notifications (key is notification_id, value is the notification objects)
-	*/
-	public function load_special($data, $notifications);
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title();
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url();
-
-	/**
-	* URL to unsubscribe to this notification
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	*/
-	public function get_unsubscribe_url($method);
-
-	/**
-	* Get the user's avatar (the user who caused the notification typically)
-	*
-	* @return string
-	*/
-	public function get_avatar();
-
-	/**
-	* Prepare to output the notification to the template
-	*/
-	public function prepare_for_display();
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template();
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables();
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $type_data The type specific data
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($type_data, $notify_users);
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data The type specific data
-	* @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($type_data, $pre_create_data);
-
-	/**
-	* Function for preparing the data for update in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	*
-	* @return array Array of data ready to be updated in the database
-	*/
-	public function create_update_array($type_data);
-
-	/**
-	* Mark this item read
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_read($return);
-
-	/**
-	* Mark this item unread
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_unread($return);
-}
diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php
new file mode 100644
index 0000000000..f9c65f7286
--- /dev/null
+++ b/phpBB/phpbb/notification/type/type_interface.php
@@ -0,0 +1,189 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications interface
+* @package notifications
+*/
+interface phpbb_notification_type_type_interface
+{
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type();
+
+	/**
+	* Set initial data from the database
+	*
+	* @param array $data Row directly from the database
+	*/
+	public function set_initial_data($data);
+
+	/**
+	* Get the id of the item
+	*
+	* @param array $type_data The type specific data
+	*/
+	public static function get_item_id($type_data);
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $type_data The type specific data
+	*/
+	public static function get_item_parent_id($type_data);
+
+	/**
+	* 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();
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $type_data The type specific data
+	* @param array $options Options for finding users for notification
+	* 		ignore_users => array of users and user types that should not receive notifications from this type because they've already been notified
+	* 						e.g.: array(2 => array(''), 3 => array('', 'email'), ...)
+	*
+	* @return array
+	*/
+	public function find_users_for_notification($type_data, $options);
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query();
+
+	/**
+	* Get the special items to load
+	*
+	* @return array Data will be combined sent to load_special() so you can run a single query and get data required for this notification type
+	*/
+	public function get_load_special();
+
+	/**
+	* Load the special items
+	*
+	* @param array $data Data from get_load_special()
+	* @param array $notifications Array of notifications (key is notification_id, value is the notification objects)
+	*/
+	public function load_special($data, $notifications);
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title();
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url();
+
+	/**
+	* URL to unsubscribe to this notification
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
+	public function get_unsubscribe_url($method);
+
+	/**
+	* Get the user's avatar (the user who caused the notification typically)
+	*
+	* @return string
+	*/
+	public function get_avatar();
+
+	/**
+	* Prepare to output the notification to the template
+	*/
+	public function prepare_for_display();
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template();
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables();
+
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $type_data The type specific data
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($type_data, $notify_users);
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data The type specific data
+	* @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($type_data, $pre_create_data);
+
+	/**
+	* Function for preparing the data for update in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be updated in the database
+	*/
+	public function create_update_array($type_data);
+
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return);
+
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return);
+}
diff --git a/phpBB/phpbb/request/interface.php b/phpBB/phpbb/request/interface.php
deleted file mode 100644
index 741db35917..0000000000
--- a/phpBB/phpbb/request/interface.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* An interface through which all application input can be accessed.
-*
-* @package phpbb_request
-*/
-interface phpbb_request_interface
-{
-	/**#@+
-	* Constant identifying the super global with the same name.
-	*/
-	const POST = 0;
-	const GET = 1;
-	const REQUEST = 2;
-	const COOKIE = 3;
-	const SERVER = 4;
-	const FILES = 5;
-	/**#@-*/
-
-	/**
-	* This function allows overwriting or setting a value in one of the super global arrays.
-	*
-	* Changes which are performed on the super globals directly will not have any effect on the results of
-	* other methods this class provides. Using this function should be avoided if possible! It will
-	* consume twice the the amount of memory of the value
-	*
-	* @param	string	$var_name	The name of the variable that shall be overwritten
-	* @param	mixed	$value		The value which the variable shall contain.
-	* 								If this is null the variable will be unset.
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 								Specifies which super global shall be changed
-	*/
-	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Central type safe input handling function.
-	* All variables in GET or POST requests should be retrieved through this function to maximise security.
-	*
-	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 										If the value is an array this may be an array of indizes which will give
-	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 										then specifying array("var", 1) as the name will return "a".
-	* @param	mixed			$default	A default value that is returned if the variable was not set.
-	* 										This function will always return a value of the same type as the default.
-	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 										Specifies which super global should be used
-	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*					the same as that of $default. If the variable is not set $default is returned.
-	*/
-	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Shortcut method to retrieve SERVER variables.
-	*
-	* @param	string|array	$var_name		See phpbb_request_interface::variable
-	* @param	mixed			$default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The server variable value.
-	*/
-	public function server($var_name, $default = '');
-
-	/**
-	* Shortcut method to retrieve the value of client HTTP headers.
-	*
-	* @param	string|array	$header_name	The name of the header to retrieve.
-	* @param	mixed			$default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The header value.
-	*/
-	public function header($var_name, $default = '');
-
-	/**
-	* Checks whether a certain variable was sent via POST.
-	* To make sure that a request was sent using POST you should call this function
-	* on at least one variable.
-	*
-	* @param	string	$name	The name of the form variable which should have a
-	*							_p suffix to indicate the check in the code that creates the form too.
-	*
-	* @return	bool			True if the variable was set in a POST request, false otherwise.
-	*/
-	public function is_set_post($name);
-
-	/**
-	* Checks whether a certain variable is set in one of the super global
-	* arrays.
-	*
-	* @param	string	$var	Name of the variable
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*							Specifies the super global which shall be checked
-	*
-	* @return	bool			True if the variable was sent as input
-	*/
-	public function is_set($var, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Checks whether the current request is an AJAX request (XMLHttpRequest)
-	*
-	* @return	bool			True if the current request is an ajax request
-	*/
-	public function is_ajax();
-
-	/**
-	* Checks if the current request is happening over HTTPS.
-	*
-	* @return	bool			True if the request is secure.
-	*/
-	public function is_secure();
-
-	/**
-	* Returns all variable names for a given super global
-	*
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*					The super global from which names shall be taken
-	*
-	* @return	array	All variable names that are set for the super global.
-	*					Pay attention when using these, they are unsanitised!
-	*/
-	public function variable_names($super_global = phpbb_request_interface::REQUEST);
-}
diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php
new file mode 100644
index 0000000000..482f0f1287
--- /dev/null
+++ b/phpBB/phpbb/request/request_interface.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package phpbb_request
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* An interface through which all application input can be accessed.
+*
+* @package phpbb_request
+*/
+interface phpbb_request_request_interface
+{
+	/**#@+
+	* Constant identifying the super global with the same name.
+	*/
+	const POST = 0;
+	const GET = 1;
+	const REQUEST = 2;
+	const COOKIE = 3;
+	const SERVER = 4;
+	const FILES = 5;
+	/**#@-*/
+
+	/**
+	* This function allows overwriting or setting a value in one of the super global arrays.
+	*
+	* Changes which are performed on the super globals directly will not have any effect on the results of
+	* other methods this class provides. Using this function should be avoided if possible! It will
+	* consume twice the the amount of memory of the value
+	*
+	* @param	string	$var_name	The name of the variable that shall be overwritten
+	* @param	mixed	$value		The value which the variable shall contain.
+	* 								If this is null the variable will be unset.
+	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
+	* 								Specifies which super global shall be changed
+	*/
+	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST);
+
+	/**
+	* Central type safe input handling function.
+	* All variables in GET or POST requests should be retrieved through this function to maximise security.
+	*
+	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
+	* 										If the value is an array this may be an array of indizes which will give
+	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
+	* 										then specifying array("var", 1) as the name will return "a".
+	* @param	mixed			$default	A default value that is returned if the variable was not set.
+	* 										This function will always return a value of the same type as the default.
+	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
+	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
+	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
+	* 										Specifies which super global should be used
+	*
+	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
+	*					the same as that of $default. If the variable is not set $default is returned.
+	*/
+	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST);
+
+	/**
+	* Shortcut method to retrieve SERVER variables.
+	*
+	* @param	string|array	$var_name		See phpbb_request_interface::variable
+	* @param	mixed			$default		See phpbb_request_interface::variable
+	*
+	* @return	mixed	The server variable value.
+	*/
+	public function server($var_name, $default = '');
+
+	/**
+	* Shortcut method to retrieve the value of client HTTP headers.
+	*
+	* @param	string|array	$header_name	The name of the header to retrieve.
+	* @param	mixed			$default		See phpbb_request_interface::variable
+	*
+	* @return	mixed	The header value.
+	*/
+	public function header($var_name, $default = '');
+
+	/**
+	* Checks whether a certain variable was sent via POST.
+	* To make sure that a request was sent using POST you should call this function
+	* on at least one variable.
+	*
+	* @param	string	$name	The name of the form variable which should have a
+	*							_p suffix to indicate the check in the code that creates the form too.
+	*
+	* @return	bool			True if the variable was set in a POST request, false otherwise.
+	*/
+	public function is_set_post($name);
+
+	/**
+	* Checks whether a certain variable is set in one of the super global
+	* arrays.
+	*
+	* @param	string	$var	Name of the variable
+	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
+	*							Specifies the super global which shall be checked
+	*
+	* @return	bool			True if the variable was sent as input
+	*/
+	public function is_set($var, $super_global = phpbb_request_interface::REQUEST);
+
+	/**
+	* Checks whether the current request is an AJAX request (XMLHttpRequest)
+	*
+	* @return	bool			True if the current request is an ajax request
+	*/
+	public function is_ajax();
+
+	/**
+	* Checks if the current request is happening over HTTPS.
+	*
+	* @return	bool			True if the request is secure.
+	*/
+	public function is_secure();
+
+	/**
+	* Returns all variable names for a given super global
+	*
+	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
+	*					The super global from which names shall be taken
+	*
+	* @return	array	All variable names that are set for the super global.
+	*					Pay attention when using these, they are unsanitised!
+	*/
+	public function variable_names($super_global = phpbb_request_interface::REQUEST);
+}
diff --git a/phpBB/phpbb/tree/interface.php b/phpBB/phpbb/tree/interface.php
deleted file mode 100644
index cc8aab2115..0000000000
--- a/phpBB/phpbb/tree/interface.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-*
-* @package tree
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-interface phpbb_tree_interface
-{
-	/**
-	* Inserts an item into the database table and into the tree.
-	*
-	* @param array	$item	The item to be added
-	* @return array Array with item data as set in the database
-	*/
-	public function insert(array $additional_data);
-
-	/**
-	* Delete an item from the tree and from the database table
-	*
-	* Also deletes the subtree from the tree and from the database table
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been deleted
-	*/
-	public function delete($item_id);
-
-	/**
-	* Move an item by a given delta
-	*
-	* An item is only moved up/down within the same parent. If the delta is
-	* larger then the number of children, the item is moved to the top/bottom
-	* of the list of children within this parent.
-	*
-	* @param int	$item_id	The item to be moved
-	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
-	* @return bool True if the item was moved
-	*/
-	public function move($item_id, $delta);
-
-	/**
-	* Move an item down by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_down($item_id);
-
-	/**
-	* Move an item up by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_up($item_id);
-
-	/**
-	* Moves all children of one item to another item
-	*
-	* If the new parent already has children, the new children are appended
-	* to the list.
-	*
-	* @param int	$current_parent_id	The current parent item
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if any items where moved
-	*/
-	public function move_children($current_parent_id, $new_parent_id);
-
-	/**
-	* Change parent item
-	*
-	* Moves the item to the bottom of the new parent's list of children
-	*
-	* @param int	$item_id			The item to be moved
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if the parent was set successfully
-	*/
-	public function change_parent($item_id, $new_parent_id);
-
-	/**
-	* Get all items that are either ancestors or descendants of the item
-	*
-	* @param int		$item_id		Id of the item to retrieve the ancestors/descendants from
-	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
-
-	/**
-	* Get all of the item's ancestors
-	*
-	* @param int		$item_id		Id of the item to retrieve the ancestors from
-	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_path_data($item_id, $order_asc, $include_item);
-
-	/**
-	* Get all of the item's descendants
-	*
-	* @param int		$item_id		Id of the item to retrieve the descendants from
-	* @param bool		$order_asc		Order the items ascendingly
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_subtree_data($item_id, $order_asc, $include_item);
-}
diff --git a/phpBB/phpbb/tree/tree_interface.php b/phpBB/phpbb/tree/tree_interface.php
new file mode 100644
index 0000000000..80d3c4377c
--- /dev/null
+++ b/phpBB/phpbb/tree/tree_interface.php
@@ -0,0 +1,122 @@
+<?php
+/**
+*
+* @package tree
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+interface phpbb_tree_tree_interface
+{
+	/**
+	* Inserts an item into the database table and into the tree.
+	*
+	* @param array	$item	The item to be added
+	* @return array Array with item data as set in the database
+	*/
+	public function insert(array $additional_data);
+
+	/**
+	* Delete an item from the tree and from the database table
+	*
+	* Also deletes the subtree from the tree and from the database table
+	*
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been deleted
+	*/
+	public function delete($item_id);
+
+	/**
+	* Move an item by a given delta
+	*
+	* An item is only moved up/down within the same parent. If the delta is
+	* larger then the number of children, the item is moved to the top/bottom
+	* of the list of children within this parent.
+	*
+	* @param int	$item_id	The item to be moved
+	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
+	* @return bool True if the item was moved
+	*/
+	public function move($item_id, $delta);
+
+	/**
+	* Move an item down by 1
+	*
+	* @param int	$item_id	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_down($item_id);
+
+	/**
+	* Move an item up by 1
+	*
+	* @param int	$item_id	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_up($item_id);
+
+	/**
+	* Moves all children of one item to another item
+	*
+	* If the new parent already has children, the new children are appended
+	* to the list.
+	*
+	* @param int	$current_parent_id	The current parent item
+	* @param int	$new_parent_id		The new parent item
+	* @return bool True if any items where moved
+	*/
+	public function move_children($current_parent_id, $new_parent_id);
+
+	/**
+	* Change parent item
+	*
+	* Moves the item to the bottom of the new parent's list of children
+	*
+	* @param int	$item_id			The item to be moved
+	* @param int	$new_parent_id		The new parent item
+	* @return bool True if the parent was set successfully
+	*/
+	public function change_parent($item_id, $new_parent_id);
+
+	/**
+	* Get all items that are either ancestors or descendants of the item
+	*
+	* @param int		$item_id		Id of the item to retrieve the ancestors/descendants from
+	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
+
+	/**
+	* Get all of the item's ancestors
+	*
+	* @param int		$item_id		Id of the item to retrieve the ancestors from
+	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_path_data($item_id, $order_asc, $include_item);
+
+	/**
+	* Get all of the item's descendants
+	*
+	* @param int		$item_id		Id of the item to retrieve the descendants from
+	* @param bool		$order_asc		Order the items ascendingly
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_subtree_data($item_id, $order_asc, $include_item);
+}
-- 
cgit v1.2.1