Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 common.php,1.68,1.69 groupcp.php,1.44,1.45 posting.php,1.143,1.144 privmsg.php,1.80,1.81 profile.php,1.178,1.179
|
From: Bart v. B. <ba...@us...> - 2002-02-17 17:02:06
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17396
Modified Files:
common.php groupcp.php posting.php privmsg.php profile.php
Log Message:
Cleaned up stuff (for Email)
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** common.php 14 Dec 2001 02:41:33 -0000 1.68
--- common.php 17 Feb 2002 17:02:03 -0000 1.69
***************
*** 154,157 ****
--- 154,192 ----
//
+ // Set some server variables related to the current URL, mostly used for Email
+ //
+ if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
+ {
+ $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
+ }
+ else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
+ {
+ $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
+ }
+ else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
+ {
+ $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
+ }
+
+ $server_name = $board_config['server_name'];
+ $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
+
+ if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
+ {
+ $server_protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
+ }
+ else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
+ {
+ $server_protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
+ }
+ else
+ {
+ $server_protocol = "http://";
+ }
+
+ $script_url = $server_protocol . $server_name . $server_port . $script_name;
+
+
+ //
// Setup forum wide options, if this fails
// then we output a CRITICAL_ERROR since
***************
*** 177,179 ****
}
! ?>
\ No newline at end of file
--- 212,214 ----
}
! ?>
Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** groupcp.php 17 Feb 2002 16:42:06 -0000 1.44
--- groupcp.php 17 Feb 2002 17:02:03 -0000 1.45
***************
*** 59,72 ****
//
- // Set default email variables
- //
- $script_name = preg_replace("/^(\/)(.*?)(\/)$/", "\\2", $board_config['script_path']) . '/groupcp.'.$phpEx;
- $server_name = $board_config['server_name'];
- $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
- $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . $board_config['server_port'] . '/' : '/';
-
- $server_url = $server_protocol . $server_name . $server_port . $script_name;
-
- //
// Default var values
//
--- 59,62 ----
***************
*** 208,212 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
);
$emailer->send();
--- 198,202 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
);
$emailer->send();
***************
*** 414,418 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
--- 404,408 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
***************
*** 520,524 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
--- 510,514 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
);
$emailer->send();
Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -r1.143 -r1.144
*** posting.php 2 Feb 2002 18:03:44 -0000 1.143
--- posting.php 17 Feb 2002 17:02:03 -0000 1.144
***************
*** 975,1022 ****
$emailer = new emailer($board_config['smtp_delivery']);
- if( isset($HTTP_SERVER_VARS['PHP_SELF']) || isset($HTTP_ENV_VARS['PHP_SELF']) )
- {
- $script_name = ( isset($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- }
- else if( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) || isset($HTTP_ENV_VARS['SCRIPT_NAME']) )
- {
- $script_name = ( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- }
- else if( isset($HTTP_SERVER_VARS['PATH_INFO']) || isset($HTTP_ENV_VARS['PATH_INFO']) )
- {
- $script_name = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- }
- else
- {
- $script_name = "viewtopic.$phpEx";
- }
- $script_name = str_replace("posting.$phpEx", "viewtopic.$phpEx", $script_name);
-
- if( isset($HTTP_SERVER_VARS['SERVER_NAME']) || isset($HTTP_ENV_VARS['SERVER_NAME']) )
- {
- $server_name = ( isset($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- }
- else if( isset($HTTP_SERVER_VARS['HTTP_HOST']) || isset($HTTP_ENV_VARS['HTTP_HOST']) )
- {
- $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- }
- else
- {
- $server_name = "";
- }
-
- if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else
- {
- $protocol = "http://";
- }
-
$orig_word = array();
$replacement_word = array();
--- 975,978 ----
***************
*** 1046,1051 ****
"TOPIC_TITLE" => $topic_title,
! "U_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! "U_STOP_WATCHING_TOPIC" => $protocol . $server_name . $script_name . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
);
--- 1002,1007 ----
"TOPIC_TITLE" => $topic_title,
! "U_TOPIC" => $script_url . "?" . POST_POST_URL . "=$new_post_id#$new_post_id",
! "U_STOP_WATCHING_TOPIC" => $script_url . "?" . POST_TOPIC_URL . "=$new_topic_id&unwatch=topic")
);
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** privmsg.php 13 Feb 2002 01:42:38 -0000 1.80
--- privmsg.php 17 Feb 2002 17:02:03 -0000 1.81
***************
*** 1083,1133 ****
if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
{
- if( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- }
- else if( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- }
- else if( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- }
- else
- {
- $script_name = "privmsg.$phpEx";
- }
-
- if ( !empty($board_config['cookie_domain']) )
- {
- $server_name = $board_config['cookie_domain'];
- }
- else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
- {
- $server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- }
- else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
- {
- $server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- }
- else
- {
- $server_name = "";
- }
-
- if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else
- {
- $protocol = "http://";
- }
-
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
--- 1083,1086 ----
***************
*** 1148,1152 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_INBOX" => $protocol . $server_name . $script_name . "?folder=inbox")
);
--- 1101,1105 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_INBOX" => $script_url . "?folder=inbox")
);
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -r1.178 -r1.179
*** profile.php 13 Feb 2002 01:11:57 -0000 1.178
--- profile.php 17 Feb 2002 17:02:03 -0000 1.179
***************
*** 36,89 ****
//
- //
- // Set default email variables
- //
- if ( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
- }
- else if ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
- }
- else if ( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
- {
- $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
- }
- else
- {
- $script_name = "profile.$phpEx";
- }
-
- if ( !empty($board_config['cookie_domain']) )
- {
- $server_name = $board_config['cookie_domain'];
- }
- else if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
- {
- $server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
- }
- else if ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
- {
- $server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
- }
- else
- {
- $server_name = "";
- }
-
- if ( !empty($HTTP_SERVER_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_SERVER_VARS['HTTPS']) ) ? ( ( $HTTP_SERVER_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else if ( !empty($HTTP_ENV_VARS['HTTPS']) )
- {
- $protocol = ( !empty($HTTP_ENV_VARS['HTTPS']) ) ? ( ( $HTTP_ENV_VARS['HTTPS'] == "on" ) ? "https://" : "http://" ) : "http://";
- }
- else
- {
- $protocol = "http://";
- }
-
// -----------------------
// Page specific functions
--- 36,39 ----
***************
*** 1116,1120 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1066,1070 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
***************
*** 1214,1218 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey",
"FAX_INFO" => $board_config['coppa_fax'],
"MAIL_INFO" => $board_config['coppa_mail'],
--- 1164,1168 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey",
"FAX_INFO" => $board_config['coppa_fax'],
"MAIL_INFO" => $board_config['coppa_mail'],
***************
*** 1236,1240 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
);
}
--- 1186,1190 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
);
}
***************
*** 1255,1259 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1205,1209 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
***************
*** 1769,1773 ****
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $protocol . $server_name . $script_name . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
--- 1719,1723 ----
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
! "U_ACTIVATE" => $script_url . "?mode=activate&act_key=$user_actkey")
);
$emailer->send();
|
