9 files changed, 49 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index b7b17f2f19..e68ba5f501 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,12 @@ matrix:
       env: DB=mysqli
     - php: 5.6
       env: DB=mysqli
+    - php: 7.0
+      env: DB=mysqli
     - php: hhvm
       env: DB=mysqli
   allow_failures:
+    - php: 7.0
     - php: hhvm
   fast_finish: true
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index a3cffe51e6..8347830d0f 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -259,6 +259,8 @@ function mcp_topic_view($id, $mode, $action)
 		* @var	int		current_row_number	Number of the post on this page
 		* @var	array	post_row			Template block array of the current post
 		* @var	array	row					Array with original post and user data
+		* @var	array	topic_info			Array with topic data
+		* @var	int		total				Total posts count
 		* @since 3.1.4-RC1
 		*/
 		$vars = array(
@@ -270,6 +272,8 @@ function mcp_topic_view($id, $mode, $action)
 			'current_row_number',
 			'post_row',
 			'row',
+			'topic_info',
+			'total',
 		);
 		extract($phpbb_dispatcher->trigger_event('core.mcp_topic_review_modify_row', compact($vars)));
 
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index fd5bce4515..9a7c4aec7f 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -279,6 +279,7 @@ class file extends \phpbb\cache\driver\base
 		if ($var_name[0] == '_')
 		{
 			global $phpEx;
+			$var_name = $this->clean_varname($var_name);
 			return file_exists($this->cache_dir . 'data' . $var_name . ".$phpEx");
 		}
 		else
@@ -334,6 +335,7 @@ class file extends \phpbb\cache\driver\base
 	{
 		global $phpEx;
 
+		$filename = $this->clean_varname($filename);
 		$file = "{$this->cache_dir}$filename.$phpEx";
 
 		$type = substr($filename, 0, strpos($filename, '_'));
@@ -516,6 +518,7 @@ class file extends \phpbb\cache\driver\base
 	{
 		global $phpEx;
 
+		$filename = $this->clean_varname($filename);
 		$file = "{$this->cache_dir}$filename.$phpEx";
 
 		$lock = new \phpbb\lock\flock($file);
@@ -584,4 +587,15 @@ class file extends \phpbb\cache\driver\base
 
 		return $return_value;
 	}
+
+	/**
+	* Replace slashes in the file name
+	*
+	* @param string $varname name of a cache variable
+	* @return string $varname name that is safe to use as a filename
+	*/
+	protected function clean_varname($varname)
+	{
+		return str_replace('/', '-', $varname);
+	}
 }
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index eaa3838f17..4f74085968 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -22,10 +22,10 @@
 	<table class="table1">
 	<thead>
 	<tr>
-		<th>{L_USERNAME}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
-		<th>{L_ACTION}</th>
+		<th class="name">{L_USERNAME}</th>
+		<th class="center">{L_IP}</th>
+		<th class="center">{L_TIME}</th>
+		<th class="name">{L_ACTION}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
 	</thead>
@@ -34,8 +34,8 @@
 		<!-- BEGIN log -->
 		<!-- IF log.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
 			<td>{log.USERNAME}</td>
-			<td style="text-align: center">{log.IP}</td>
-			<td style="text-align: center">{log.DATE}</td>
+			<td class="center">{log.IP}</td>
+			<td class="center">{log.DATE}</td>
 			<td>{log.ACTION}<br />
 			{log.DATA}
 		</td>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index ec317b141a..3e8d47eb9d 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -65,9 +65,9 @@
 	<table class="table1">
 	<thead>
 	<tr>
-		<th>{L_REPORT_BY}</th>
-		<th style="text-align: center">{L_IP}</th>
-		<th style="text-align: center">{L_TIME}</th>
+		<th class="name reportby">{L_REPORT_BY}</th>
+		<th class="center">{L_IP}</th>
+		<th class="center">{L_TIME}</th>
 		<th>{L_ACTION_NOTE}</th>
 		<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
 	</tr>
@@ -76,11 +76,11 @@
 	<!-- BEGIN usernotes -->
 	<!-- IF usernotes.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
 		<td>{usernotes.REPORT_BY}</td>
-		<td style="text-align: center">{usernotes.IP}</td>
-		<td style="text-align: center">{usernotes.REPORT_AT}</td>
+		<td class="center">{usernotes.IP}</td>
+		<td class="center">{usernotes.REPORT_AT}</td>
 		<td>{usernotes.ACTION}</td>
 
-		<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%; text-align: center;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
+		<!-- IF S_CLEAR_ALLOWED --><td class="center" style="width: 5%;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index 6fec0b8aed..65909b7068 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -10,19 +10,19 @@
 		<table class="table1">
 			<thead>
 				<tr>
-					<th>{L_LOGIN_KEY}</th>
-					<th>{L_IP}</th>
-					<th>{L_LOGIN_TIME}</th>
-					<th class="mark">{L_MARK}</th>
+					<th class="name">{L_LOGIN_KEY}</th>
+					<th class="center">{L_IP}</th>
+					<th class="center">{L_LOGIN_TIME}</th>
+					<th class="center mark">{L_MARK}</th>
 				</tr>
 			</thead>
 			<tbody>
 			<!-- BEGIN sessions -->
 				<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
 					<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
-					<td style="text-align: center">{sessions.IP}</td>
-					<td style="text-align: center">{sessions.LOGIN_TIME}</td>
-					<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
+					<td class="center">{sessions.IP}</td>
+					<td class="center">{sessions.LOGIN_TIME}</td>
+					<td class="center mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
 				</tr>
 			<!-- BEGINELSE -->
 				<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 9da24b6ef9..11e3314f17 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -671,6 +671,8 @@ table.table1 tbody th {
 
 /* Specific column styles */
 table.table1 .name		{ text-align: left; }
+table.table1 .center		{ text-align: center; }
+table.table1 .reportby	{ width: 15%; }
 table.table1 .posts		{ text-align: center; width: 7%; }
 table.table1 .joined	{ text-align: left; width: 15%; }
 table.table1 .active	{ text-align: left; width: 15%; }
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
index 3f63319b59..087ae89743 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -16,9 +16,9 @@
 </tr>
 <tr>
 	<th>{L_LOGIN_KEY}</th>
-	<th>{L_IP}</th>
-	<th>{L_LOGIN_TIME}</th>
-	<th>{L_MARK}</th>
+	<th class="center">{L_IP}</th>
+	<th class="center">{L_LOGIN_TIME}</th>
+	<th class="center">{L_MARK}</th>
 </tr>
 <!-- BEGIN sessions -->
 	<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 3c7ff23db5..7764020567 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -322,6 +322,10 @@ th {
 	padding: 7px 5px;
 }
 
+th.center {
+	text-align: center;
+}
+
 td {
 	padding: 2px;
 }