[gentoo-commits] gentoo-projects commit in forums/htdocs/admin: admin_forums.php admin_ranks.php admin_smilies.php admin_statistics.php admin_styles.php admin_ug_auth.php admin_users.php admin_words.php

[Dean Stephens (desultory)]

desultory    09/07/30 06:38:50

  Modified:             admin_forums.php admin_ranks.php admin_smilies.php
                        admin_statistics.php admin_styles.php
                        admin_ug_auth.php admin_users.php admin_words.php
  Log:
  Upgrade to 2.0.23, add some proxy fixes, fix bug 191626 and bug 170166.

Revision  Changes    Path
1.5                  forums/htdocs/admin/admin_forums.php

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

Index: admin_forums.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_forums.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin_forums.php	8 Jun 2006 22:08:45 -0000	1.4
+++ admin_forums.php	30 Jul 2009 06:38:50 -0000	1.5
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_forums.php,v 1.4 2006/06/08 22:08:45 tomk Exp $
+ *   $Id: admin_forums.php,v 1.5 2009/07/30 06:38:50 desultory Exp $
  *
  ***************************************************************************/
 
@@ -806,7 +806,7 @@
 					$vote_ids = '';
 					do
 					{
-						$vote_ids = (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
+						$vote_ids .= (($vote_ids != '') ? ', ' : '') . $row['vote_id'];
 					}
 					while ($row = $db->sql_fetchrow($result));
 



1.6                  forums/htdocs/admin/admin_ranks.php

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

Index: admin_ranks.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_ranks.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin_ranks.php	9 Jun 2006 19:14:17 -0000	1.5
+++ admin_ranks.php	30 Jul 2009 06:38:50 -0000	1.6
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_ranks.php,v 1.5 2006/06/09 19:14:17 tomk Exp $
+ *   $Id: admin_ranks.php,v 1.6 2009/07/30 06:38:50 desultory Exp $
  *
  ***************************************************************************/
 
@@ -34,7 +34,7 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);



1.5                  forums/htdocs/admin/admin_smilies.php

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

Index: admin_smilies.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_smilies.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin_smilies.php	9 Jun 2006 19:14:17 -0000	1.4
+++ admin_smilies.php	30 Jul 2009 06:38:50 -0000	1.5
@@ -6,7 +6,7 @@
 *     copyright            : (C) 2001 The phpBB Group
 *     email                : support@×××××.com
 *
-*     $Id: admin_smilies.php,v 1.4 2006/06/09 19:14:17 tomk Exp $
+*     $Id: admin_smilies.php,v 1.5 2009/07/30 06:38:50 desultory Exp $
 *
 ****************************************************************************/
 
@@ -36,23 +36,20 @@
 	return;
 }
 
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+
+$cancel = ( isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel']) ) ? true : false;
+$no_page_header = $cancel;
+
 //
 // Load default header
 //
-if( isset($HTTP_GET_VARS['export_pack']) )
+if ((!empty($HTTP_GET_VARS['export_pack']) && $HTTP_GET_VARS['export_pack'] == 'send') || (!empty($_GET['export_pack']) && $_GET['export_pack'] == 'send'))
 {
-	if ( $HTTP_GET_VARS['export_pack'] == "send" )
-	{	
-		$no_page_header = true;
-	}
+	$no_page_header = true;
 }
 
-$phpbb_root_path = "./../";
-require($phpbb_root_path . 'extension.inc');
-
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
-$no_page_header = $cancel;
-
 require('./pagestart.' . $phpEx);
 
 if ($cancel)



1.4                  forums/htdocs/admin/admin_statistics.php

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

Index: admin_statistics.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_statistics.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin_statistics.php	10 May 2006 13:11:05 -0000	1.3
+++ admin_statistics.php	30 Jul 2009 06:38:50 -0000	1.4
@@ -6,7 +6,7 @@
 *   copyright            : (C) 2002 Meik Sievertsen
 *   email                : acyd.burn@×××.de
 *
-*   $Id: admin_statistics.php,v 1.3 2006/05/10 13:11:05 tomk Exp $
+*   $Id: admin_statistics.php,v 1.4 2009/07/30 06:38:50 desultory Exp $
 *
 *
 ***************************************************************************/
@@ -879,11 +879,12 @@
 
 	$__language = $board_config['default_lang'];
 
-	if (!@file_exists(@realpath($phpbb_root_path . $__stats_config['modules_dir'] . '/' . $__module_name . '/lang_' . $__language . '/lang.' . $phpEx)))
+	// 2008-12 desultory -- Localization data moved from lang.php to lang_extra.php some time ago.
+	if (!@file_exists(@realpath($phpbb_root_path . 'language/lang_' . $__language . '/lang_extra.' . $phpEx)))
 	{
 		$__language = 'english';
 	}
-	include($phpbb_root_path . $__stats_config['modules_dir'] . '/' . $__module_name . '/lang_' . $__language . '/lang.' . $phpEx);
+	include($phpbb_root_path . 'language/lang_' . $__language . '/lang_extra.' . $phpEx);
 
 	$statistics->result_cache_used = FALSE;
 	$statistics->db_cache_used = FALSE;



1.5                  forums/htdocs/admin/admin_styles.php

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

Index: admin_styles.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_styles.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin_styles.php	9 Jun 2006 19:14:17 -0000	1.4
+++ admin_styles.php	30 Jul 2009 06:38:50 -0000	1.5
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_styles.php,v 1.4 2006/06/09 19:14:17 tomk Exp $
+ *   $Id: admin_styles.php,v 1.5 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -41,10 +41,10 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
+$confirm = (isset($HTTP_POST_VARS['confirm']) || isset($_POST['confirm'])) ? TRUE : FALSE;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? TRUE : FALSE;
 
-$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE;
+$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || !empty($_POST['send_file']) || $cancel) ? TRUE : FALSE;
 
 require('./pagestart.' . $phpEx);
 



1.4                  forums/htdocs/admin/admin_ug_auth.php

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

Index: admin_ug_auth.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_ug_auth.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin_ug_auth.php	29 Jan 2006 18:20:14 -0000	1.3
+++ admin_ug_auth.php	30 Jul 2009 06:38:50 -0000	1.4
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_ug_auth.php,v 1.3 2006/01/29 18:20:14 tomk Exp $
+ *   $Id: admin_ug_auth.php,v 1.4 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -231,11 +231,47 @@
 		else
 		{
 	
-			$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
+			$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : array();
 
 			if ( empty($adv) )
 			{
-				$change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
+				$sql = "SELECT f.* 
+					FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c
+					WHERE f.cat_id = c.cat_id
+					ORDER BY c.cat_order, f.forum_order ASC";
+				if ( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
+				}
+
+				$forum_access = $forum_auth_level_fields = array();
+				while( $row = $db->sql_fetchrow($result) )
+				{
+					$forum_access[] = $row;
+				}
+				$db->sql_freeresult($result);
+
+				for($i = 0; $i < count($forum_access); $i++)
+				{
+					$forum_id = $forum_access[$i]['forum_id'];
+
+					for($j = 0; $j < count($forum_auth_fields); $j++)
+					{
+						$forum_auth_level_fields[$forum_id][$forum_auth_fields[$j]] = $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL;
+					}
+				}
+
+				while( list($forum_id, $value) = @each($HTTP_POST_VARS['private']) )
+				{
+					while( list($auth_field, $exists) = @each($forum_auth_level_fields[$forum_id]) )
+					{
+						if ($exists)
+						{
+							$change_acl_list[$forum_id][$auth_field] = $value;
+						}
+					}
+				}
+
 			}
 			else
 			{
@@ -289,11 +325,11 @@
 				$forum_id = $forum_access[$i]['forum_id'];
 
 				if ( 
-					( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) || 
-					( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) ) 
+					( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id] != $auth_access[$forum_id]['auth_mod'] ) || 
+					( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]) ) 
 				)
 				{
-					$update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
+					$update_mod_status[$forum_id] = $change_mod_list[$forum_id];
 
 					if ( !$update_mod_status[$forum_id] )
 					{



1.11                 forums/htdocs/admin/admin_users.php

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

Index: admin_users.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_users.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- admin_users.php	29 Dec 2006 11:52:49 -0000	1.10
+++ admin_users.php	30 Jul 2009 06:38:50 -0000	1.11
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_users.php,v 1.10 2006/12/29 11:52:49 tomk Exp $
+ *   $Id: admin_users.php,v 1.11 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -109,30 +109,12 @@
 				message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
 			}
 			
-			$sql = "SELECT group_id
-				FROM " . GROUPS_TABLE . "
+			$sql = "UPDATE " . GROUPS_TABLE . "
+				SET group_moderator = " . $userdata['user_id'] . "
 				WHERE group_moderator = $user_id";
-			if( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql);
-			}
-			
-			while ( $row_group = $db->sql_fetchrow($result) )
-			{
-				$group_moderator[] = $row_group['group_id'];
-			}
-			
-			if ( count($group_moderator) )
+			if( !$db->sql_query($sql) )
 			{
-				$update_moderator_id = implode(', ', $group_moderator);
-				
-				$sql = "UPDATE " . GROUPS_TABLE . "
-					SET group_moderator = " . $userdata['user_id'] . "
-					WHERE group_moderator IN ($update_moderator_id)";
-				if( !$db->sql_query($sql) )
-				{
-					message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
-				}
+				message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . USERS_TABLE . "



1.5                  forums/htdocs/admin/admin_words.php

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

Index: admin_words.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/admin/admin_words.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin_words.php	9 Jun 2006 19:14:17 -0000	1.4
+++ admin_words.php	30 Jul 2009 06:38:50 -0000	1.5
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: admin_words.php,v 1.4 2006/06/09 19:14:17 tomk Exp $
+ *   $Id: admin_words.php,v 1.5 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -35,7 +35,7 @@
 $phpbb_root_path = "./../";
 require($phpbb_root_path . 'extension.inc');
 
-$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+$cancel = (isset($HTTP_POST_VARS['cancel']) || isset($_POST['cancel'])) ? true : false;
 $no_page_header = $cancel;
 
 require('./pagestart.' . $phpEx);
@@ -107,8 +107,8 @@
 		}
 
 		$template->assign_vars(array(
-			"WORD" => $word_info['word'],
-			"REPLACEMENT" => $word_info['replacement'],
+			"WORD" => htmlspecialchars($word_info['word']),
+			"REPLACEMENT" => htmlspecialchars($word_info['replacement']),
 
 			"L_WORDS_TITLE" => $lang['Words_title'],
 			"L_WORDS_TEXT" => $lang['Words_explain'],
@@ -257,8 +257,8 @@
 		$template->assign_block_vars("words", array(
 			"ROW_COLOR" => "#" . $row_color,
 			"ROW_CLASS" => $row_class,
-			"WORD" => $word,
-			"REPLACEMENT" => $replacement,
+			"WORD" => htmlspecialchars($word),
+			"REPLACEMENT" => htmlspecialchars($replacement),
 
 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&amp;id=$word_id"),
 			"U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&amp;id=$word_id"))