phpbb-checkins Mailing List for phpBB (Page 625)

phpBB is the world's leading open source discussion forum software.

Brought to you by: acydburn, marshalrusty, naderman, noxwizard979

phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (193)	Nov (393)	Dec (347)
2002	Jan (401)	Feb (232)	Mar (343)	Apr (129)	May (129)	Jun (116)	Jul (189)	Aug (129)	Sep (68)	Oct (172)	Nov (298)	Dec (148)
2003	Jan (264)	Feb (210)	Mar (322)	Apr (309)	May (234)	Jun (188)	Jul (215)	Aug (161)	Sep (234)	Oct (163)	Nov (110)	Dec (7)
2004	Jan (95)	Feb (107)	Mar (55)	Apr (3)	May (49)	Jun (35)	Jul (57)	Aug (43)	Sep (56)	Oct (40)	Nov (25)	Dec (21)
2005	Jan (93)	Feb (25)	Mar (22)	Apr (72)	May (45)	Jun (24)	Jul (29)	Aug (20)	Sep (50)	Oct (93)	Nov (69)	Dec (183)
2006	Jan (185)	Feb (143)	Mar (402)	Apr (260)	May (322)	Jun (367)	Jul (234)	Aug (299)	Sep (206)	Oct (288)	Nov (338)	Dec (307)
2007	Jan (296)	Feb (250)	Mar (261)	Apr (434)	May (539)	Jun (274)	Jul (440)	Aug (190)	Sep (128)	Oct (249)	Nov (86)	Dec (51)
2008	Jan (177)	Feb (67)	Mar (61)	Apr (48)	May (56)	Jun (97)	Jul (60)	Aug (64)	Sep (151)	Oct (79)	Nov (109)	Dec (123)
2009	Jan (70)	Feb (70)	Mar (73)	Apr (80)	May (22)	Jun (193)	Jul (191)	Aug (181)	Sep (120)	Oct (48)	Nov (24)	Dec

Flat | Threaded

<< < 1 .. 623 624 625 626 627 .. 629 > >> (Page 625 of 629)

[Phpbb-checkins] CVS: phpBB2/admin admin_disallow.php,1.1,1.2

From: Jonathan H. <the...@us...> - 2001-10-15 20:41:45

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29376

Modified Files:
	admin_disallow.php 
Log Message:
oops forgot append_sid


Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin_disallow.php	2001/10/15 20:15:46	1.1
--- admin_disallow.php	2001/10/15 20:41:42	1.2
***************
*** 24,28 ****
  {
  	$filename = basename(__FILE__);
! 	$module['Users']['Disallow'] = $filename;
  
  	return;
--- 24,28 ----
  {
  	$filename = basename(__FILE__);
! 	$module['Users']['Disallow'] = append_sid($filename);
  
  	return;
***************
*** 120,124 ****
  	"L_ADD" => $lang['Add'],
  	"L_RESET" => $lang['Reset'],
! 	"S_FORM_ACTION" => 'admin_disallow.php',
  	"L_EXPLAIN" => $lang['disallow_instructs'],
  	"L_DEL_DISALLOW" => $lang['del_disallow'],
--- 120,124 ----
  	"L_ADD" => $lang['Add'],
  	"L_RESET" => $lang['Reset'],
! 	"S_FORM_ACTION" => append_sid('admin_disallow.php'),
  	"L_EXPLAIN" => $lang['disallow_instructs'],
  	"L_DEL_DISALLOW" => $lang['del_disallow'],

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.5,1.6

From: Jonathan H. <the...@us...> - 2001-10-15 20:15:50

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv17128/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
Username Disallow Admin...


Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** lang_main.php	2001/10/15 00:38:30	1.5
--- lang_main.php	2001/10/15 20:15:46	1.6
***************
*** 140,144 ****
  
  $lang['You_last_visit'] = "You last visited on";
! 
  $lang['Welcome_to'] = "Welcome to"; // Followed by site name
  $lang['Register'] = "Register";
--- 140,144 ----
  
  $lang['You_last_visit'] = "You last visited on";
! $lang['Add'] = "Add";
  $lang['Welcome_to'] = "Welcome to"; // Followed by site name
  $lang['Register'] = "Register";
***************
*** 1098,1103 ****
  
  //
  // That's all Folks!
  // -------------------------------------------------
  
! ?>
\ No newline at end of file
--- 1098,1117 ----
  
  //
+ // Disallow Username Admin
+ //
+ $lang['disallowed_deleted'] = "The disallowed username has successfully been removed";
+ $lang['disallowed_already'] = "The username you are trying to disallow has already been disallowed, or a user currently exists that this would disallow";
+ $lang['disallow_successful'] = "The disallowed username has successfully been added";
+ $lang['Disallow_control'] = "Username Disallow Control";
+ $lang['disallow_instructs'] = "Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of '*'.  Please note that you will not be allowed to specify a username to disallow if that username has already been registered.  You must first delete that username, and then disallow it.";
+ $lang['del_disallow'] = "Remove a Disallowed Username";
+ $lang['del_disallow_explain'] = "You can remove a disallowed username by selecting the username from this list and clicking submit";
+ $lang['add_disallow'] = "Add a disallowed username";
+ $lang['add_disallow_explain'] = "You can disallow a username using the wildcard character '*' to match any character";
+ $lang['no_disallowed'] = "No Disallowed Usernames";
+ 
+ //
  // That's all Folks!
  // -------------------------------------------------
  
! ?>

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.74,1.75

From: Jonathan H. <the...@us...> - 2001-10-15 20:15:49

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv17128/includes

Modified Files:
	functions.php 
Log Message:
Username Disallow Admin...


Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** functions.php	2001/10/14 15:48:38	1.74
--- functions.php	2001/10/15 20:15:46	1.75
***************
*** 487,491 ****
  			$sql_disallow = "SELECT disallow_username
  				FROM " . DISALLOW_TABLE . "
! 				WHERE disallow_username = '$username'";
  			if($result = $db->sql_query($sql_users))
  			{
--- 487,491 ----
  			$sql_disallow = "SELECT disallow_username
  				FROM " . DISALLOW_TABLE . "
! 				WHERE '$username' LIKE disallow_username";
  			if($result = $db->sql_query($sql_users))
  			{
***************
*** 514,518 ****
  				SELECT disallow_username, NULL
  					FROM " . DISALLOW_TABLE . "
! 					WHERE disallow_username = '$username'";
  			if($result = $db->sql_query($sql))
  			{
--- 514,518 ----
  				SELECT disallow_username, NULL
  					FROM " . DISALLOW_TABLE . "
! 					WHERE '$username' LIKE disallow_username";
  			if($result = $db->sql_query($sql))
  			{
***************
*** 1208,1210 ****
  }
  
! ?>
\ No newline at end of file
--- 1208,1210 ----
  }
  
! ?>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin disallow_body.tpl,NONE,1.1

From: Jonathan H. <the...@us...> - 2001-10-15 20:15:49

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17128/templates/subSilver/admin

Added Files:
	disallow_body.tpl 
Log Message:
Username Disallow Admin...


--- NEW FILE ---

<h1>{L_DISALLOW_TITLE}</h1>
<p>{L_EXPLAIN}</p>

<form method="post" action="{S_FORM_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
	<tr> 
	  <th class="thHead" colspan="2">{L_DEL_DISALLOW}</th>
	</tr>
	<tr> 
	  <td class="row1">{L_USERNAME}: <br />
		<span class="gensmall">{L_DEL_EXPLAIN}</span></td>
	  <td class="row2">{S_DISALLOW_SELECT}&nbsp;<input type="submit" name="mode" value="{L_DELETE}" class="liteoption" /></td>
	</tr>
	<tr> 
	  <th class="thHead" colspan="2">{L_ADD_DISALLOW}</th>
	</tr>
	<tr> 
	  <td class="row1">{L_USERNAME}: <br />
		<span class="gensmall">{L_ADD_EXPLAIN}></td>
	  <td class="row2">
		<input type="text" name="disallowed_user" size="35" />
	  </td>
	</tr>
	<tr> 
	  <td class="catBottom" colspan="2" align="center">
		<input type="submit" name="mode" value="{L_ADD}" class="mainoption" />
		&nbsp;&nbsp;
		<input type="reset" value="{L_RESET}" class="liteoption" />
	  </td>
	</tr>
</table></form>

<p>{L_INFO}</p>

[Phpbb-checkins] CVS: phpBB2/admin admin_disallow.php,NONE,1.1

From: Jonathan H. <the...@us...> - 2001-10-15 20:15:49

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17128/admin

Added Files:
	admin_disallow.php 
Log Message:
Username Disallow Admin...


--- NEW FILE ---
<?php
/***************************************************************************
 *                            admin_disallow.php
 *                            -------------------
 *   begin                : Tuesday, Oct 05, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: admin_disallow.php,v 1.1 2001/10/15 20:15:46 the_systech Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program 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 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

if($setmodules == 1)
{
	$filename = basename(__FILE__);
	$module['Users']['Disallow'] = $filename;

	return;
}

//
// Include required files, get $phpEx and check permissions
//
$phpbb_root_dir = "./../";
require('pagestart.inc');

//
// Check to see what mode we shold operate in.
//
if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
}
else
{
	$mode = "";
}
$output_info = '';
switch( $mode )
{
	case $lang['Delete']:
		$disallowed_id = ( isset($HTTP_POST_VARS['disallowed_id']) ) ? intval( $HTTP_POST_VARS['disallowed_id'] ) : intval( $HTTP_GET_VARS['disallowed_id'] );
		
		$sql = 'DELETE FROM '.DISALLOW_TABLE.' WHERE disallow_id = '.$disallowed_id;
		$result = $db->sql_query($sql);
		if( !$result )
		{
			message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql);
		}
		$output_info = $lang['disallowed_deleted'];
		break;
	case $lang['Add']:
		$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
		$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
		if( !validate_username( $disallowed_user ) )
		{
			$output_info = $lang['disallowed_already'];
		}
		else
		{
			$sql = 'INSERT INTO '.DISALLOW_TABLE."(disallow_username) VALUES('".$disallowed_user."')";
			$result = $db->sql_query( $sql );
			if ( !$result )
			{
				message_die(GENERAL_ERROR, "Could not add disallowed user.", "",__LINE__, __FILE__, $sql);
			}
			$output_info = $lang['disallow_successful'];
		}
		break;
}
//
// Grab the current list of disallowed usernames...
//
$sql = 'SELECT * FROM '.DISALLOW_TABLE;
$result = $db->sql_query($sql);
if( !$result )
{
	message_die( GENERAL_ERROR, "Couldn't get disallowed users.", "", __LINE__, __FILE__, $sql );
}
$disallowed = $db->sql_fetchrowset($result);

//
// Ok now generate the info for the template, which will be put out no matter
// what mode we are in.
//
$disallow_select = "<SELECT NAME=\"disallowed_id\">";
if ( trim($disallowed) == '' )
{
	$disallow_select .= '<option value="">'.$lang['no_disallowed'].'</option>';
}
else 
{
	$disallow_select .= "<OPTION value=\"\">".$lang['Select'].' '.$lang['Username']."</OPTION>";
	$user = array();
	for( $i = 0; $i < count($disallowed); $i++ )
	{
		$disallowed[$i]['disallow_username'] = preg_replace( '/%/', '*', $disallowed[$i]['disallow_username']);
		$disallow_select .= '<option value="'.$disallowed[$i]['disallow_id'].'">'.$disallowed[$i]['disallow_username'].'</option>';
	}
}
$disallow_select .= '</SELECT>';
$template->set_filenames(array(
	"body" => "admin/disallow_body.tpl")
);
$template->assign_vars(array(
	"S_DISALLOW_SELECT" => $disallow_select,
	"L_INFO" => $output_info,
	"L_DISALLOW_TITLE" => $lang['Disallow_control'],
	"L_DELETE" => $lang['Delete'],
	"L_ADD" => $lang['Add'],
	"L_RESET" => $lang['Reset'],
	"S_FORM_ACTION" => 'admin_disallow.php',
	"L_EXPLAIN" => $lang['disallow_instructs'],
	"L_DEL_DISALLOW" => $lang['del_disallow'],
	"L_DEL_EXPLAIN" => $lang['del_disallow_explain'],
	"L_ADD_DISALLOW" => $lang['add_disallow'],
	"L_ADD_EXPLAIN" => $lang['add_disallow_explain'],
	"L_USERNAME" => $lang['Username'])
);
$template->pparse("body");
?>

[Phpbb-checkins] CVS: phpBB2/templates/PSO/admin disallow_body.tpl,NONE,1.1

From: Jonathan H. <the...@us...> - 2001-10-15 20:15:49

Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv17128/templates/PSO/admin

Added Files:
	disallow_body.tpl 
Log Message:
Username Disallow Admin...


--- NEW FILE ---

<br clear="all" />

<h1>{L_DISALLOW_TITLE}</h1>

<p>{L_EXPLAIN_EXPLAIN}</p>

<form method="post" action="{S_FORM_ACTION}"><table width="80%" cellspacing="1" cellpadding="4" border="0" align="center">
	<tr>
		<td class="cat" colspan="2" align="center">{L_DEL_DISALLOW}</td>
	</tr>
	<tr>
		<td class="row1">{L_USERNAME}:&nbsp;<br /><span class="gensmall">{L_DEL_EXPLAIN}</span></td>
		<td class="row2">{S_DISALLOW_SELECT} &nbps;<input type="submit" name="mode" value="{L_DELETE}" /></td>
	</tr>
	<tr>
		<td class="cat" colspan="2" align="center">{L_ADD_DISALLOW}</td>
	</tr>
	<tr>
		<td class="row1">{L_USERNAME}:&nbsp;<br /><span class="gensmall">{L_ADD_EXPLAIN}</span></td>
		<td class="row2"><input type="text" name="disallowed_user" size="35" /></td>
	</tr>
	<tr>
		<td class="cat" colspan="2" align="center"><input type="submit" name="mode" value="{L_ADD}" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" /></td>
	</tr>
</table></form>

<p>{L_INFO}</p>

<br	clear="all" />

[Phpbb-checkins] CVS: phpBB2/templates/subSilver faq.tpl,1.1,NONE

From: Paul S. O. <ps...@us...> - 2001-10-15 19:17:55

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv25709/templates/subSilver

Removed Files:
	faq.tpl 
Log Message:
Replaced by faq_body.tpl and the faq language file

--- faq.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2/templates/subSilver modcp_viewip.tpl,1.3,1.4

From: Paul S. O. <ps...@us...> - 2001-10-15 19:14:51

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv24937/templates/subSilver

Modified Files:
	modcp_viewip.tpl 
Log Message:
Fixed bug #471317

Index: modcp_viewip.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_viewip.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modcp_viewip.tpl	2001/10/15 19:13:39	1.3
--- modcp_viewip.tpl	2001/10/15 19:14:48	1.4
***************
*** 32,36 ****
  		<tr> 
  		  <td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td>
! 		  <td align="right"><a href="userrow.U_SEARCHPOSTS"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> 
  			&nbsp;</td>
  		</tr>
--- 32,36 ----
  		<tr> 
  		  <td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td>
! 		  <td align="right"><a href="{userrow.U_SEARCHPOSTS}"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> 
  			&nbsp;</td>
  		</tr>

[Phpbb-checkins] CVS: phpBB2/templates/subSilver modcp_viewip.tpl,1.2,1.3

From: Paul S. O. <ps...@us...> - 2001-10-15 19:13:42

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv24583/templates/subSilver

Modified Files:
	modcp_viewip.tpl 
Log Message:
Fixed bug #471317

Index: modcp_viewip.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/modcp_viewip.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** modcp_viewip.tpl	2001/10/01 23:22:18	1.2
--- modcp_viewip.tpl	2001/10/15 19:13:39	1.3
***************
*** 32,36 ****
  		<tr> 
  		  <td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td>
! 		  <td align="right"><a href="%7Buserrow.U_SEARCHPOSTS%7D"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> 
  			&nbsp;</td>
  		</tr>
--- 32,36 ----
  		<tr> 
  		  <td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td>
! 		  <td align="right"><a href="userrow.U_SEARCHPOSTS"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> 
  			&nbsp;</td>
  		</tr>

[Phpbb-checkins] CVS: phpBB2/db postgres_basic.sql,1.13,1.14

From: Jonathan H. <the...@us...> - 2001-10-15 16:09:02

Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv905

Modified Files:
	postgres_basic.sql 
Log Message:
modified to make compatible with postgres 7.0, still works with 7.1


Index: postgres_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres_basic.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** postgres_basic.sql	2001/10/11 22:26:01	1.13
--- postgres_basic.sql	2001/10/15 16:08:59	1.14
***************
*** 86,94 ****
  
  -- Demo Topic
! INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, EXTRACT(EPOCH FROM TIMESTAMP 'now'), 0, 0, 1, 0, 0, 1);
  
  
  -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, EXTRACT(EPOCH FROM TIMESTAMP 'now'), '', '7F000001');
  INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, '', 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');
  
--- 86,94 ----
  
  -- Demo Topic
! INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, date_part('EPOCH', TIMESTAMP 'now'), 0, 0, 1, 0, 0, 1);
  
  
  -- Demo Post
! INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, date_part('EPOCH', TIMESTAMP 'now'), '', '7F000001');
  INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, '', 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');

[Phpbb-checkins] CVS: phpBB2 profile.php,1.120,1.121

From: Paul S. O. <ps...@us...> - 2001-10-15 16:00:51

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv30879

Modified Files:
	profile.php 
Log Message:
Fix for potential security/HTML abuse problem, thanks Silverion

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** profile.php	2001/10/14 22:32:38	1.120
--- profile.php	2001/10/15 16:00:47	1.121
***************
*** 927,931 ****
  						$user_avatar_remoteurl = "http://" . $user_avatar_remoteurl;
  					}
! 					$avatar_sql = ", user_avatar = '$user_avatar_remoteurl', user_avatar_type = " . USER_AVATAR_REMOTE;
  				}
  			}
--- 927,940 ----
  						$user_avatar_remoteurl = "http://" . $user_avatar_remoteurl;
  					}
! 
! 					if( preg_match("/^http\:\/\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+\/.*?\.(gif|jpg|png)$/is", $user_avatar_remoteurl) )
! 					{
! 						$avatar_sql = ", user_avatar = '$user_avatar_remoteurl', user_avatar_type = " . USER_AVATAR_REMOTE;
! 					}
! 					else
! 					{
! 						$error = true;
! 						$error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
! 					}
  				}
  			}

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin forums_body.tpl,1.3,NONE admin_config_body.tpl,1.7,NONE

From: Paul S. O. <ps...@us...> - 2001-10-15 12:58:32

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6067

Removed Files:
	forums_body.tpl admin_config_body.tpl 
Log Message:
Gone but not forgotten ... forgotten what?

--- forums_body.tpl DELETED ---

--- admin_config_body.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2/admin admin_userauth.php,1.20,1.21 admin_groupauth.php,1.19,1.20

From: Paul S. O. <ps...@us...> - 2001-10-15 12:13:29

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24645/admin

Modified Files:
	admin_userauth.php admin_groupauth.php 
Log Message:
Fixed for groupauth bug #471227 + header location changes for append_sid

Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_userauth.php	2001/10/14 15:46:53	1.20
--- admin_userauth.php	2001/10/15 12:13:26	1.21
***************
*** 572,576 ****
  		else
  		{
! 			header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id"));
  		}
  	}
--- 572,576 ----
  		else
  		{
! 			header("Location: " . append_sid("admin_userauth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
  		}
  	}

Index: admin_groupauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groupauth.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_groupauth.php	2001/10/14 15:46:53	1.19
--- admin_groupauth.php	2001/10/15 12:13:26	1.20
***************
*** 496,500 ****
  	else
  	{
! 		header("Location: " . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id"));
  	}
  
--- 496,501 ----
  	else
  	{
! 
! 		header("Location: " . append_sid("admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=$group_id", true));
  	}
  
***************
*** 863,867 ****
  
  	$template->set_filenames(array(
! 		"body" => "admin/auth_group_select_body.tpl")
  	);
  
--- 864,868 ----
  
  	$template->set_filenames(array(
! 		"body" => "admin/auth_select_body.tpl")
  	);

[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.24,1.25

From: Doug K. <dou...@us...> - 2001-10-15 02:58:53

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32673/admin

Modified Files:
	admin_users.php 
Log Message:
Allows for selectable ranks in user admin.

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** admin_users.php	2001/10/14 15:46:53	1.24
--- admin_users.php	2001/10/15 02:58:50	1.25
***************
*** 140,144 ****
  	exit;
  }
! else if ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) )
  {
  	//
--- 140,144 ----
  	exit;
  }
! else if ( ($mode == "edit") || (isset($HTTP_POST_VARS['username_select']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL])) )
  {
  	//
***************
*** 152,156 ****
  	else
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username']);
  	}
  
--- 152,156 ----
  	else
  	{
! 		$this_userdata = get_userdata($HTTP_POST_VARS['username_select']);
  	}
  
***************
*** 200,205 ****
  	$smilies_status =  ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF'];
  
! 	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $this_userdata['user_id'] . '" />';
  	
  	if( $user_avatar_type )
--- 200,205 ----
  	$smilies_status =  ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF'];
  
! 	$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
! 	$s_hidden_fields .= '<input type="hidden" name="id" value="' . $this_userdata['user_id'] . '" />';
  	
  	if( $user_avatar_type )
***************
*** 223,226 ****
--- 223,253 ----
  	}
  
+ 	$sql = "SELECT * FROM " . RANKS_TABLE . "
+ 		WHERE rank_special = 1
+ 		ORDER BY rank_title";
+ 	if( !$result = $db->sql_query($sql) )
+ 	{
+ 		message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
+ 	}
+ 	$rank_count = $db->sql_numrows($result);
+ 
+ 	$rank_rows = $db->sql_fetchrowset($result);
+ 
+ 	$rank_select_box = "";
+ 
+ 	for($i = 0; $i < $rank_count; $i++)
+ 	{
+ 		$rank = $rank_rows[$i]['rank_title'];
+ 		$rank_id = $rank_rows[$i]['rank_id'];
+ 		if ( $this_userdata['user_rank'] == $i + 1 )
+ 		{
+ 			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
+ 		}
+ 		else
+ 		{
+ 			$rank_select_box .= "<option value=\"" . $rank_id . "\">" . $rank . "</option>";		
+ 		}	
+ 	}
+ 
  	$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
  
***************
*** 272,275 ****
--- 299,303 ----
  		"USER_ACTIVE_YES" => ($user_status) ? "checked=\"checked\"" : "",
  		"USER_ACTIVE_NO" => (!$user_status) ? "checked=\"checked\"" : "", 
+ 		"RANK_SELECT_BOX" => $rank_select_box,
  
  		"L_PASSWORD_IF_CHANGED" => $lang['password_if_changed'],
***************
*** 327,330 ****
--- 355,359 ----
  		"L_DELETE_USER" => $lang['User_delete'],
  		"L_DELETE_USER_EXPLAIN" => $lang['User_delete_explain'],
+ 		"L_SELECT_RANK" => $lang['Rank_title'],
  
  		"S_HIDDEN_FIELDS" => $s_hidden_fields,
***************
*** 334,343 ****
  	$template->pparse("body");
  }
! else if( isset($HTTP_POST_VARS['submit']) && isset($HTTP_POST_VARS['user_id']) )
  {
  	//
  	// Ok, the profile has been modified and submitted, let's update
  	//
! 	$user_id = intval($HTTP_POST_VARS['user_id']);
  
  	$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
--- 363,372 ----
  	$template->pparse("body");
  }
! else if( $HTTP_POST_VARS['mode'] == "save" )
  {
  	//
  	// Ok, the profile has been modified and submitted, let's update
  	//
! 	$user_id = intval($HTTP_POST_VARS['id']);
  
  	$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
***************
*** 377,381 ****
  	$user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
! 	$user_allowavatar = (!empty($HTTP_POST_VARS['usr_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
  
  	if(isset($HTTP_POST_VARS['submit']))
--- 406,413 ----
  	$user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
! 	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : "";
! 	
! 	$user_rank_sql = (isset($user_rank)) ? ", user_rank = " . $user_rank : "";
  
  	if(isset($HTTP_POST_VARS['submit']))
***************
*** 412,429 ****
  	if( $signature != "" )
  	{
! 		if( strlen($signature) > $board_config['max_sig_chars'] )
! 		{
! 			$error = TRUE;
! 			if(isset($error_msg))
! 			{
! 				$error_msg .= "<br />";
! 			}
! 			$error_msg .= $lang['Signature_too_long'];
! 		}
! 		else
! 		{
! 			$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
! 			$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
! 		}
  	}
  
--- 444,449 ----
  	if( $signature != "" )
  	{
! 		$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
! 		$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
  	}
  
***************
*** 503,509 ****
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey'" . $avatar_sql . "
  				WHERE user_id = $user_id";
! 			if($result = $db->sql_query($sql))
  			{
  				$template->set_filenames(array(
--- 523,529 ----
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey' " . $user_rank_sql . $avatar_sql . "
  				WHERE user_id = $user_id";
! 			if( $result = $db->sql_query($sql) )
  			{
  				$template->set_filenames(array(

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin user_edit_body.tpl,1.3,1.4 user_select_body.tpl,1.3,1.4

From: Doug K. <dou...@us...> - 2001-10-15 02:58:53

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32673/templates/subSilver/admin

Modified Files:
	user_edit_body.tpl user_select_body.tpl 
Log Message:
Allows for selectable ranks in user admin.

Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_edit_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** user_edit_body.tpl	2001/10/14 15:55:50	1.3
--- user_edit_body.tpl	2001/10/15 02:58:50	1.4
***************
*** 238,241 ****
--- 238,245 ----
  		<span class="gen">{L_NO}</span></td>
  	</tr>
+ 	<tr>
+ 		<td class="row1"><span class="gen">{L_SELECT_RANK}:</span></td>
+ 		<td class="row2"><select name="user_rank">{RANK_SELECT_BOX}</select></td>
+ 	</tr>
  	<tr> 
  	  <td class="row1"><span class="gen">{L_DELETE_USER}?</span></td>

Index: user_select_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/user_select_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** user_select_body.tpl	2001/10/14 15:55:50	1.3
--- user_select_body.tpl	2001/10/15 02:58:50	1.4
***************
*** 9,13 ****
  	</tr>
  	<tr>
! 		<td class="row1" align="center"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="submit" value="{L_LOOK_UP}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
  	</tr>
  </table></form>
--- 9,13 ----
  	</tr>
  	<tr>
! 		<td class="row1" align="center"><input type="text" class="post" name="username_select" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" /><input type="submit" name="submit" value="{L_LOOK_UP}" class="mainoption" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
  	</tr>
  </table></form>

[Phpbb-checkins] CVS: phpBB2/templates/PSO/admin user_edit_body.tpl,1.11,1.12

From: Doug K. <dou...@us...> - 2001-10-15 02:58:53

Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32673/templates/PSO/admin

Modified Files:
	user_edit_body.tpl 
Log Message:
Allows for selectable ranks in user admin.

Index: user_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/user_edit_body.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** user_edit_body.tpl	2001/09/25 18:18:47	1.11
--- user_edit_body.tpl	2001/10/15 02:58:50	1.12
***************
*** 138,141 ****
--- 138,145 ----
  	</tr>
  	<tr>
+ 		<td class="row1"><span class="gen">{L_SELECT_RANK}:</span></td>
+ 		<td class="row2"><select name="user_rank">{RANK_SELECT_BOX}</select></td>
+ 	</tr>
+ 	<tr>
  		<td class="row1"><span class="gen">{L_DELETE_USER}?</span></td>
  		<td class="row2"><input type="checkbox" name="deleteuser">{L_DELETE_USER_EXPLAIN}</td>

[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.34,1.35

From: Paul S. O. <ps...@us...> - 2001-10-15 01:35:34

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv7719/includes

Modified Files:
	sessions.php 
Log Message:
I am a total moron, please excuse me

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** sessions.php	2001/10/14 18:22:32	1.34
--- sessions.php	2001/10/15 01:35:32	1.35
***************
*** 38,42 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
  		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename]) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
--- 38,42 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
  	{
  		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename]) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
***************
*** 177,181 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
--- 177,181 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
***************
*** 358,362 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
--- 358,362 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename]) )
  	{
  		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";

[Phpbb-checkins] CVS: phpBB2/templates/PSO/admin group_edit_body.tpl,1.2,1.3

From: Doug K. <dou...@us...> - 2001-10-15 00:38:33

Update of /cvsroot/phpbb/phpBB2/templates/PSO/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26258/templates/PSO/admin

Modified Files:
	group_edit_body.tpl 
Log Message:
A few minor bug fixes in the group control panel.

Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/PSO/admin/group_edit_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** group_edit_body.tpl	2001/09/06 01:44:55	1.2
--- group_edit_body.tpl	2001/10/15 00:38:30	1.3
***************
*** 25,28 ****
--- 25,34 ----
  			</tr>
  			<tr>
+ 				<td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}:</span>
+ 				<br />
+ 				<span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
+ 				<td class="row2"><input type="checkbox" name="delete_old_moderator" value="1" />&nbsp;&nbsp;{L_YES}</td>
+ 			</tr>
+ 			<tr>
  				<td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
  				<td class="row2"><input type="radio" name="group_type" value="1" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="0" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED}</td>

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_main.php,1.4,1.5

From: Doug K. <dou...@us...> - 2001-10-15 00:38:33

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv26258/language/lang_english

Modified Files:
	lang_main.php 
Log Message:
A few minor bug fixes in the group control panel.

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** lang_main.php	2001/10/14 15:47:23	1.4
--- lang_main.php	2001/10/15 00:38:30	1.5
***************
*** 1006,1009 ****
--- 1006,1012 ----
  $lang['No_group_moderator'] = "You must specify a moderator for this group";
  $lang['No_group_mode'] = "You must specify a mode for this group, open or closed";
+ $lang['delete_group_moderator'] = "Delete the old group moderator?";
+ $lang['delete_moderator_explain'] = "If you're changing the group moderator, check this box to remove the old moderator from the group.  Otherwise, do not check it, and the user will become a regular member of the group.";
+

[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.10,1.11

From: Doug K. <dou...@us...> - 2001-10-15 00:38:33

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26258/admin

Modified Files:
	admin_groups.php 
Log Message:
A few minor bug fixes in the group control panel.

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** admin_groups.php	2001/10/14 15:46:53	1.10
--- admin_groups.php	2001/10/15 00:38:30	1.11
***************
*** 133,136 ****
--- 133,139 ----
  		"L_SUBMIT" => $lang['submit_group_changes'],
  		"L_RESET" => $lang['reset_group_changes'],
+ 		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
+ 		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
+ 		"L_YES" => $lang['Yes'],
  
  		"S_SELECT_MODERATORS" => $select_list,
***************
*** 162,169 ****
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? $HTTP_POST_VARS['group_type'] : "";
! 		$group_name = isset($HTTP_POST_VARS['group_name']) ? $HTTP_POST_VARS['group_name'] : "";
! 		$group_description = isset($HTTP_POST_VARS['group_description']) ? $HTTP_POST_VARS['group_description'] : "";
  		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
  
  		if( $group_name == "" )
--- 165,173 ----
  	else
  	{
! 		$group_type = isset($HTTP_POST_VARS['group_type']) ? trim(addslashes($HTTP_POST_VARS['group_type'])) : "";
! 		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim(addslashes($HTTP_POST_VARS['group_name'])) : "";
! 		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim(addslashes($HTTP_POST_VARS['group_description'])) : "";
  		$group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
+ 		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
  
  		if( $group_name == "" )
***************
*** 182,187 ****
  		if( $mode == "editgroup" )
  		{
! 
! 			echo $sql = "UPDATE " . GROUPS_TABLE . "
  				SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator 
  				WHERE group_id = $group_id";
--- 186,222 ----
  		if( $mode == "editgroup" )
  		{
! 			$sql = "SELECT *
! 				FROM " . GROUPS_TABLE . "
! 				WHERE group_single_user <> " . TRUE . "
! 				AND group_id = " . $group_id;
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
! 			}
! 			if( !$db->sql_numrows($result) )
! 			{
! 				message_die(GENERAL_MESSAGE, "That user group does not exist");
! 			}
! 			$group_info = $db->sql_fetchrow($result);		
! 		
! 			if ( $group_info['group_moderator'] != $group_moderator )
! 			{
! 				if ( $delete_old_moderator != "" )
! 				{
! 					$sql = "DELETE FROM " . USER_GROUP_TABLE . "
! 						WHERE user_id = " . $group_info['group_moderator'] . " AND group_id = " . $group_id;
! 					if ( !$result = $db->sql_query($sql) )
! 					{
! 						message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
! 					}
! 				}
! 				$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
! 					VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
! 				if ( !$result = $db->sql_query($sql) )
! 				{
! 					message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
! 				}
! 			}
! 			$sql = "UPDATE " . GROUPS_TABLE . "
  				SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator 
  				WHERE group_id = $group_id";
***************
*** 197,201 ****
  
  			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ($group_type, '" . $group_name . "', '" . $group_description . "', $group_moderator,	'0')";
  			if ( !$result = $db->sql_query($sql) )
  			{
--- 232,236 ----
  
  			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
! 				VALUES ('" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "',	'0')";
  			if ( !$result = $db->sql_query($sql) )
  			{

[Phpbb-checkins] CVS: phpBB2/templates/subSilver/admin group_edit_body.tpl,1.4,1.5

From: Doug K. <dou...@us...> - 2001-10-15 00:38:33

Update of /cvsroot/phpbb/phpBB2/templates/subSilver/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26258/templates/subSilver/admin

Modified Files:
	group_edit_body.tpl 
Log Message:
A few minor bug fixes in the group control panel.

Index: group_edit_body.tpl
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/templates/subSilver/admin/group_edit_body.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** group_edit_body.tpl	2001/10/14 15:55:50	1.4
--- group_edit_body.tpl	2001/10/15 00:38:30	1.5
***************
*** 26,29 ****
--- 26,37 ----
  	</tr>
  	<tr> 
+ 	  <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span>
+ 	  <br />
+ 	  <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td>
+ 	  <td class="row2" width="62%"> 
+ 		<input type="checkbox" name="delete_old_moderator" value="1">
+ 		{L_YES}</td>
+ 	</tr>
+ 	<tr> 
  	  <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td>
  	  <td class="row2" width="62%">

[Phpbb-checkins] CVS: phpBB2 profile.php,1.119,1.120 posting.php,1.79,1.80 privmsg.php,1.34,1.35

From: Paul S. O. <ps...@us...> - 2001-10-14 22:32:41

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv32204

Modified Files:
	profile.php posting.php privmsg.php 
Log Message:
Altered uri's in emails to utilise HTTP_HOST if available + altered some METAs to append_sid

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** profile.php	2001/10/14 18:22:32	1.119
--- profile.php	2001/10/14 22:32:38	1.120
***************
*** 980,983 ****
--- 980,984 ----
  
  							$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
+ 							$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
  
  							if( $board_config['require_activation'] == USER_ACTIVATION_SELF )
***************
*** 999,1003 ****
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$act_key")
  							);
  							$emailer->send();
--- 1000,1004 ----
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$act_key")
  							);
  							$emailer->send();
***************
*** 1013,1017 ****
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=index.' . $phpEx . '">')
  						);
  
--- 1014,1018 ----
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  						);
  
***************
*** 1078,1081 ****
--- 1079,1083 ----
  
  								$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
+ 								$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
  
  								$emailer->use_template($email_template);
***************
*** 1092,1096 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey",
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
--- 1094,1098 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey",
  										"FAX_INFO" => $board_config['coppa_fax'],
  										"MAIL_INFO" => $board_config['coppa_mail'],
***************
*** 1114,1118 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  									);
  								}
--- 1116,1120 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  	
! 										"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  									);
  								}
***************
*** 1133,1137 ****
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
--- 1135,1139 ----
  										"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
  
! 										"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  									);
  									$emailer->send();
***************
*** 1140,1144 ****
  
  								$template->assign_vars(array(
! 									"META" => '<meta http-equiv="refresh" content="5;url=index.' . $phpEx . '">')
  								);
  
--- 1142,1146 ----
  
  								$template->assign_vars(array(
! 									"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  								);
  
***************
*** 1637,1640 ****
--- 1639,1643 ----
  
  				$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
+ 				$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
  
  				$emailer->use_template("user_activate_passwd");
***************
*** 1649,1653 ****
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  					
! 					"U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();
--- 1652,1656 ----
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  					
! 					"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  				);
  				$emailer->send();
***************
*** 1655,1659 ****
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="5;url=index.' . $phpEx . '">')
  				);
  
--- 1658,1662 ----
  
  				$template->assign_vars(array(
! 					"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  				);
  
***************
*** 1738,1743 ****
  							$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
- 							$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
- 
  							$emailer->use_template("admin_welcome_activated");
  							$emailer->email_address($row['user_email']);
--- 1741,1744 ----
***************
*** 1755,1759 ****
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=index.' . $phpEx . '">')
  							);
  
--- 1756,1760 ----
  
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  							);
  
***************
*** 1763,1767 ****
  						{
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=index.' . $phpEx . '">')
  							);
  
--- 1764,1768 ----
  						{
  							$template->assign_vars(array(
! 								"META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
  							);
  

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** posting.php	2001/10/14 18:22:32	1.79
--- posting.php	2001/10/14 22:32:38	1.80
***************
*** 757,760 ****
--- 757,761 ----
  									$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  									$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
+ 									$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
  
  									for($i = 0; $i < count($email_set); $i++)
***************
*** 773,778 ****
  												"TOPIC_TITLE" => $email_set[$i]['topic_title'],
  
! 												"U_TOPIC" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! 												"U_STOP_WATCHING_TOPIC" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
  											);
  
--- 774,779 ----
  												"TOPIC_TITLE" => $email_set[$i]['topic_title'],
  
! 												"U_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! 												"U_STOP_WATCHING_TOPIC" => "http://" . $server_name . $path . "/viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
  											);
  

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** privmsg.php	2001/10/14 18:22:32	1.34
--- privmsg.php	2001/10/14 22:32:38	1.35
***************
*** 979,982 ****
--- 979,984 ----
  				{
  					$path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']);
+ 					$server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_SERVER_VARS['SERVER_NAME'];
+ 
  					$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
***************
*** 995,999 ****
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/privmsg.$phpEx?folder=inbox")
  					);
  
--- 997,1001 ----
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_INBOX" => "http://" . $server_name . $path . "/privmsg.$phpEx?folder=inbox")
  					);

[Phpbb-checkins] CVS: phpBB2/admin admin_forum_prune.php,1.9,1.10

From: Paul S. O. <ps...@us...> - 2001-10-14 22:13:59

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26942/admin

Modified Files:
	admin_forum_prune.php 
Log Message:
Fixed GET/POST problem

Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_forum_prune.php	2001/10/14 15:46:53	1.9
--- admin_forum_prune.php	2001/10/14 22:13:57	1.10
***************
*** 54,58 ****
  {
  	$forum_id = ( isset($HTTP_POST_VARS[POST_FORUM_URL]) ) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL];
! 	$forum_sql = ($forum_id == "ALL") ? "" : "AND forum_id = $forum_id";
  }
  else
--- 54,67 ----
  {
  	$forum_id = ( isset($HTTP_POST_VARS[POST_FORUM_URL]) ) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL];
! 
! 	if( $forum_id == "ALL" )
! 	{
! 		$forum_sql = "";
! 	}
! 	else
! 	{
! 		$forum_id = intval($forum_id);
! 		$forum_sql = "AND forum_id = $forum_id";
! 	}
  }
  else
***************
*** 97,100 ****
--- 106,110 ----
  		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
+ 
  		$i++;
  
***************
*** 121,125 ****
  	// display a select box to use for pruning.
  	//
! 	if( empty($HTTP_GET_VARS[POST_FORUM_URL]) )
  	{
  		//
--- 131,135 ----
  	// display a select box to use for pruning.
  	//
! 	if( empty($HTTP_POST_VARS[POST_FORUM_URL]) )
  	{
  		//
***************
*** 153,157 ****
  	else
  	{
! 		$forum_id = $HTTP_GET_VARS[POST_FORUM_URL];
  
  		//
--- 163,167 ----
  	else
  	{
! 		$forum_id = intval($HTTP_POST_VARS[POST_FORUM_URL]);
  
  		//

[Phpbb-checkins] CVS: phpBB2 config.php,1.39,1.40

From: Paul S. O. <ps...@us...> - 2001-10-14 20:05:51

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27378

Modified Files:
	config.php 
Log Message:
And I'll add it back ... please leave blank for now

Index: config.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/config.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** config.php	2001/10/14 20:05:19	1.39
--- config.php	2001/10/14 20:05:48	1.40
***************
*** 1,19 ****
- <?php
- 
- //
- // phpBB 2.x auto-generated config file
- // Do not change anything in this file!
- //
- 
- $dbms = "mysql";
- 
- $dbhost = "localhost";
- $dbname = "dev_starstreak_net";
- $dbuser = "devhttp";
- $dbpasswd = "efx2KarizonaD";
- 
- $table_prefix = "phpbb_";
- 
- define('PHPBB_INSTALLED', true);
- 
- ?>
\ No newline at end of file
--- 0 ----

[Phpbb-checkins] CVS: phpBB2 config.php,1.38,1.39

From: Paul S. O. <ps...@us...> - 2001-10-14 20:05:21

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27290

Added Files:
	config.php 
Log Message:
And I'll add it back ... please leave blank for now

7 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 623 624 625 626 627 .. 629 > >> (Page 625 of 629)