[gentoo-commits] gentoo-projects commit in forums/htdocs/includes: bbcode.php constants.php functions.php functions_admin.php functions_validate.php page_header.php page_tail.php sessions.php usercp_register.php

[Dean Stephens (desultory)]

desultory    09/07/30 06:38:51

  Modified:             bbcode.php constants.php functions.php
                        functions_admin.php functions_validate.php
                        page_header.php page_tail.php sessions.php
                        usercp_register.php
  Log:
  Upgrade to 2.0.23, add some proxy fixes, fix bug 191626 and bug 170166.

Revision  Changes    Path
1.21                 forums/htdocs/includes/bbcode.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/bbcode.php?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/bbcode.php?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/bbcode.php?r1=1.20&r2=1.21

Index: bbcode.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/bbcode.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bbcode.php	8 Jun 2006 22:08:45 -0000	1.20
+++ bbcode.php	30 Jul 2009 06:38:50 -0000	1.21
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: bbcode.php,v 1.20 2006/06/08 22:08:45 tomk Exp $
+ *   $Id: bbcode.php,v 1.21 2009/07/30 06:38:50 desultory Exp $
  *
  ***************************************************************************/
 
@@ -1077,7 +1077,7 @@
 	}
 
 	// 2005-06-21 tomk - Change http -> https for forums links if you're logged in securely
-	if (isset($_SERVER['HTTPS']))
+	if (isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]))
 	{
 		$ret = preg_replace("#http://forums(|test).gentoo.org#is", "https://forums\\1.gentoo.org", $ret);
 		// 2005-07-17 tomk - also do it for bugs



1.18                 forums/htdocs/includes/constants.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/constants.php?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/constants.php?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/constants.php?r1=1.17&r2=1.18

Index: constants.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/constants.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- constants.php	6 Feb 2007 18:42:11 -0000	1.17
+++ constants.php	30 Jul 2009 06:38:50 -0000	1.18
@@ -6,7 +6,7 @@
  *   copyright            : ('C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: constants.php,v 1.17 2007/02/06 18:42:11 tomk Exp $
+ *   $Id: constants.php,v 1.18 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -203,6 +203,8 @@
 define('MTYPE_REPLY', 'Post reply');
 define('MTYPE_PRVMSG', 'Private message');
 define('MTYPE_NEWACC', 'New account created');
+# 2009-03 desultory -- Bug 170166.
+define('MTYPE_SPAMMER', 'Profile spammer detected'); # DANGER, DANGER!
 
 // 2006-0306 tomk - values for this topic/forum search dropdown
 define('THIS_ALL', 0);



1.26                 forums/htdocs/includes/functions.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.25&r2=1.26

Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- functions.php	24 Nov 2008 06:14:23 -0000	1.25
+++ functions.php	30 Jul 2009 06:38:50 -0000	1.26
@@ -7,7 +7,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: functions.php,v 1.25 2008/11/24 06:14:23 robbat2 Exp $
+ *   $Id: functions.php,v 1.26 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -395,7 +395,7 @@
 
 		$userdata['user_lang'] = $default_lang;
 	}
-	elseif ( $userdata['user_id'] === ANONYMOUS && $board_config['default_lang'] !== $default_lang )
+	elseif ( $userdata['user_id'] == ANONYMOUS && $board_config['default_lang'] !== $default_lang )
 	{
 		$sql = 'UPDATE ' . CONFIG_TABLE . "
 			SET config_value = '" . $default_lang . "'



1.5                  forums/htdocs/includes/functions_admin.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_admin.php?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_admin.php?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_admin.php?r1=1.4&r2=1.5

Index: functions_admin.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- functions_admin.php	8 Jun 2006 22:08:45 -0000	1.4
+++ functions_admin.php	30 Jul 2009 06:38:50 -0000	1.5
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: functions_admin.php,v 1.4 2006/06/08 22:08:45 tomk Exp $
+ *   $Id: functions_admin.php,v 1.5 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -26,7 +26,7 @@
 //
 function make_forum_select($box_name, $ignore_forum = false, $select_forum = '')
 {
-	global $db, $userdata;
+	global $db, $userdata, $lang;
 
 	$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
 
@@ -50,7 +50,7 @@
 		}
 	}
 
-	$forum_list = ( $forum_list == '' ) ? '<option value="-1">-- ! No Forums ! --</option>' : '<select name="' . $box_name . '">' . $forum_list . '</select>';
+	$forum_list = ( $forum_list == '' ) ? $lang['No_forums'] : '<select name="' . $box_name . '">' . $forum_list . '</select>';
 
 	return $forum_list;
 }



1.3                  forums/htdocs/includes/functions_validate.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_validate.php?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_validate.php?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions_validate.php?r1=1.2&r2=1.3

Index: functions_validate.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions_validate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- functions_validate.php	1 Nov 2005 12:00:03 -0000	1.2
+++ functions_validate.php	30 Jul 2009 06:38:50 -0000	1.3
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: functions_validate.php,v 1.2 2005/11/01 12:00:03 tomk Exp $
+ *   $Id: functions_validate.php,v 1.3 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -101,7 +101,7 @@
 	$db->sql_freeresult($result);
 
 	// Don't allow " and ALT-255 in username.
-	if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)))
+	if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)) || strstr($username, chr(173)))
 	{
 		return array('error' => true, 'error_msg' => $lang['Username_invalid']);
 	}



1.13                 forums/htdocs/includes/page_header.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_header.php?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_header.php?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_header.php?r1=1.12&r2=1.13

Index: page_header.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/page_header.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- page_header.php	13 Aug 2006 15:22:02 -0000	1.12
+++ page_header.php	30 Jul 2009 06:38:50 -0000	1.13
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: page_header.php,v 1.12 2006/08/13 15:22:02 tomk Exp $
+ *   $Id: page_header.php,v 1.13 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -414,7 +414,7 @@
 	$rank_title = $rank['rank_title'];
 	if (isset($lang[$rank_title.'_rank'])) 
 		$rank_title = $lang[$rank_title.'_rank'];
-	$ranks_legend .= sprintf('&nbsp [ <span style="color:#%s">%s</span> ] ',
+	$ranks_legend .= sprintf('&nbsp; [ <span style="color:#%s">%s</span> ] ',
 			$rank['rank_colour'], $rank_title);
 }
 



1.6                  forums/htdocs/includes/page_tail.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_tail.php?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_tail.php?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/page_tail.php?r1=1.5&r2=1.6

Index: page_tail.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/page_tail.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- page_tail.php	22 May 2006 16:07:48 -0000	1.5
+++ page_tail.php	30 Jul 2009 06:38:50 -0000	1.6
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: page_tail.php,v 1.5 2006/05/22 16:07:48 tomk Exp $
+ *   $Id: page_tail.php,v 1.6 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -36,8 +36,9 @@
 	'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl')
 );
 
+// 2008-12 desultory -- Front end https tweak.
 $template->assign_vars(array(
-	'SERVER_PROTOCOL' => ($board_config['cookie_secure'] || $_SERVER['HTTPS']) ? 'https://' : 'http://',
+	'SERVER_PROTOCOL' => ($board_config['cookie_secure'] || $_SERVER['HTTPS'] || isset($_SERVER["HTTP_FRONT_END_HTTPS"])) ? 'https://' : 'http://',
 	'PHPBB_VERSION' => '2' . $board_config['version'],
 	'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''),
 	'ADMIN_LINK' => $admin_link,
@@ -76,4 +77,4 @@
 
 exit;
 
-?>
\ No newline at end of file
+?>



1.12                 forums/htdocs/includes/sessions.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/sessions.php?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/sessions.php?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/sessions.php?r1=1.11&r2=1.12

Index: sessions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/sessions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sessions.php	11 Aug 2006 13:41:28 -0000	1.11
+++ sessions.php	30 Jul 2009 06:38:50 -0000	1.12
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: sessions.php,v 1.11 2006/08/11 13:41:28 maedhros Exp $
+ *   $Id: sessions.php,v 1.12 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -29,7 +29,8 @@
 	{
 		global $board_config;
 
-		$this->secure = ($board_config['cookie_secure'] || $_SERVER['HTTPS']);
+		// 2008-12 desultory -- Front end https tweak.
+		$this->secure = ($board_config['cookie_secure'] || $_SERVER['HTTPS'] || isset($_SERVER["HTTP_FRONT_END_HTTPS"]));
 		$this->name = ($this->secure) ? $name.'_s' : $name;
 	}
 



1.28                 forums/htdocs/includes/usercp_register.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/usercp_register.php?r1=1.27&r2=1.28

Index: usercp_register.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/usercp_register.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- usercp_register.php	12 Apr 2007 19:17:37 -0000	1.27
+++ usercp_register.php	30 Jul 2009 06:38:50 -0000	1.28
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: usercp_register.php,v 1.27 2007/04/12 19:17:37 tomk Exp $
+ *   $Id: usercp_register.php,v 1.28 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -732,6 +732,9 @@
 						$emailer->use_template('admin_dupe_ip_spammer', $defaults['default_lang']);
 						$emailer->set_subject($lang['Dupe_ip_spammer']);
 						$emailer->email_address($board_config['board_email']);
+
+						# 2009-03 desultory -- Bug 170166.
+						$emailer->message_type(MTYPE_SPAMMER);
 						
 						$emailer->assign_vars(array(
 							'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)),