r30

Экспорт. Коммит №28. Экспорт из приватного репозитария завершен. _Xz_. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@30 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/includes/init_bb.php

@@ -131,13 +131,13 @@ function bb_setcookie ($name, $val, $lifetime = COOKIE_PERSIST, $httponly = fals
 
 	if (PHP_VERSION < 5.2)
 	{
-	  // HttpOnly hack by Matt Mecham [http://blog.mattmecham.com/archives/2006/09/http_only_cookies_without_php.html]
+		// HttpOnly hack by Matt Mecham [http://blog.mattmecham.com/archives/2006/09/http_only_cookies_without_php.html]
-	  $domain .= ($httponly) ? '; HttpOnly' : '';
+		$domain .= ($httponly) ? '; HttpOnly' : '';
-	  return setcookie($name, $val, $lifetime, $bb_cfg['cookie_path'], $domain, $bb_cfg['cookie_secure']);
+		return setcookie($name, $val, $lifetime, $bb_cfg['cookie_path'], $domain, $bb_cfg['cookie_secure']);
 	}
 	else
 	{
-	  return setcookie($name, $val, $lifetime, $bb_cfg['cookie_path'], $domain, $bb_cfg['cookie_secure'], $httponly);
+		return setcookie($name, $val, $lifetime, $bb_cfg['cookie_path'], $domain, $bb_cfg['cookie_secure'], $httponly);
 	}
 }
 

upload/includes/sessions.php

@@ -490,6 +490,8 @@ class user_common
 				COOKIE_DBG,
 				'torhelp',
 				'kb_layout',
+				'explain',
+				'sql_log'
 			);
 
 			foreach ($delete_cookies as $cookie)
@@ -500,8 +502,7 @@ class user_common
 				}
 			}
 		}
-
+        else
-		if ($user_id != ANONYMOUS)
 		{
 			$c_sdata_resv = !empty($_COOKIE[COOKIE_DATA]) ? $_COOKIE[COOKIE_DATA] : null;
 			$c_sdata_curr = ($this->sessiondata) ? serialize($this->sessiondata) : '';

upload/report.php

@@ -1,38 +1,14 @@
 <?php
 
-/*
-	This file is part of TorrentPier
-
-	TorrentPier is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	TorrentPier is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	A copy of the GPL 2.0 should have been included with the program.
-	If not, see http://www.gnu.org/licenses/
-
-	Official SVN repository and contact information can be found at
-	http://code.google.com/p/torrentpier/
- */
-
 define('IN_PHPBB', true);
 define('BB_SCRIPT', 'report');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
+require(INC_DIR ."bbcode.php");
 require(INC_DIR ."functions_report.php");
 
 // Init userdata
-$user->session_start();
+$user->session_start(array('req_login' => true));
-
-if (!$userdata['session_logged_in'])
-{
-	redirect(append_sid("index.php", true));
-}
 
 $return_links = array(
 	'index' => '<br /><br />' . sprintf($lang['CLICK_RETURN_INDEX'], '<a href="' . append_sid("index.php") . '">', '</a>'),
@@ -691,7 +667,7 @@ else
 						}
 						else if ($report_change['report_change_comment'] != '')
 						{
-							$report_change_text = sprintf($lang['REPORT_CHANGE_TEXT_COMMENT'], $report_change_status, $report_change_user, $report_change_time, $report_change['report_change_comment']);
+							$report_change_text = sprintf($lang['REPORT_CHANGE_TEXT_COMMENT'], $report_change_status, $report_change_user, $report_change_time, bbcode2html($report_change['report_change_comment']));
 						}
 						else
 						{
@@ -739,7 +715,7 @@ else
 					'REPORT_TITLE' => $report['report_title'],
 					'REPORT_AUTHOR' => $report['username'],
 					'REPORT_TIME' => bb_date($report['report_time']),
-					'REPORT_DESC' => str_replace("\n", '<br />', $report['report_desc']),
+					'REPORT_DESC' => bbcode2html($report['report_desc']),
 					'REPORT_STATUS' => $lang['REPORT_STATUS'][$report['report_status']],
 					'REPORT_STATUS_CLASS' => $report_status_classes[$report['report_status']],
 

upload/templates/default/report_view_body.tpl

@@ -5,7 +5,7 @@
 	<tr>
 		<td class="row1" style="padding: 10px">
 			<span class="maintitle">{REPORT_TITLE}</span><br /><br />
-			
+
 			<!-- BEGIN switch_report_subject_deleted -->
 			<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="bodyline">
 				<tr>
@@ -14,7 +14,7 @@
 			</table>
 			<br />
 			<!-- END switch_report_subject_deleted -->
-			
+
 			<!-- BEGIN report_subject -->
 			<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="bodyline">
 				<!-- BEGIN switch_subject -->
@@ -40,7 +40,7 @@
 			</table>
 			<br />
 			<!-- END report_subject -->
-			
+
 			<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="bodyline">
 				<tr>
 					<td class="row2" width="25%"><span class="genmed">{L_REPORTED_BY}:</span></td>
@@ -61,10 +61,10 @@
 				<!-- END switch_report_reason -->
 				<tr>
 					<td class="row2" valign="top"><span class="gen">{L_MESSAGE}:</span></td>
-					<td class="row2"><span class="gen">{REPORT_DESC}</span></td>
+					<td class="row2"><div class="post_wrap">{REPORT_DESC}</div></td>
 				</tr>
 			</table>
-			
+
 			<br />
 
 			<table cellspacing="1" cellpadding="4" border="0" width="90%" align="center" class="bodyline">
@@ -84,7 +84,7 @@
 				</tr>
 				<!-- END switch_report_changes -->
 			</table>
-			
+
 			<br />
 		</td>
 	</tr>
@@ -94,7 +94,7 @@
 	</tr>
 	<!-- BEGIN report_changes -->
 	<tr>
-		<td class="{switch_report_changes.report_changes.ROW_CLASS}"><span class="genmed">{switch_report_changes.report_changes.TEXT}</span></td>
+		<td class="{switch_report_changes.report_changes.ROW_CLASS}"><div class="med post_wrap">{switch_report_changes.report_changes.TEXT}</div></td>
 	</tr>
 	<!-- END report_changes -->
 	<!-- END switch_report_changes -->