* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2007-09-09 11:08 Tom Knight,,, (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight,,, (tomk) @ 2007-09-09 11:08 UTC (permalink / raw
To: gentoo-commits
tomk 07/09/09 11:08:21
Modified: functions.php
Log:
Added UTF-8 charset definition to content type headers
Revision Changes Path
1.23 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.22&r2=1.23
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- functions.php 29 Dec 2006 11:52:49 -0000 1.22
+++ functions.php 9 Sep 2007 11:08:20 -0000 1.23
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.22 2006/12/29 11:52:49 tomk Exp $
+ * $Id: functions.php,v 1.23 2007/09/09 11:08:20 tomk Exp $
*
*
***************************************************************************/
@@ -1077,7 +1077,7 @@
if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')))
{
header('Refresh: 0; URL=' . $server_protocol . $server_name . $server_port . $script_name . $url);
- echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $server_protocol . $server_name . $server_port . $script_name . $url . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . $server_protocol . $server_name . $server_port . $script_name . $url . '">HERE</a> to be redirected</div></body></html>';
+ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta http-equiv="refresh" content="0; url=' . $server_protocol . $server_name . $server_port . $script_name . $url . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . $server_protocol . $server_name . $server_port . $script_name . $url . '">HERE</a> to be redirected</div></body></html>';
exit;
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2008-11-24 6:09 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 11+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-24 6:09 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/24 06:09:44
Modified: functions.php
Log:
If running phpBB on Apache behind a Squid reverse proxy that provides the HTTPS, you need to use "cache_peer ... front-end-https" in Squid, as well as check the HTTP_FRONT_END_HTTPS variable inside PHP to safely detect HTTPS.
Revision Changes Path
1.24 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.23&r2=1.24
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -w -b -B -u -u -r1.23 -r1.24
--- functions.php 9 Sep 2007 11:08:20 -0000 1.23
+++ functions.php 24 Nov 2008 06:09:44 -0000 1.24
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.23 2007/09/09 11:08:20 tomk Exp $
+ * $Id: functions.php,v 1.24 2008/11/24 06:09:44 robbat2 Exp $
*
*
***************************************************************************/
@@ -1066,7 +1066,7 @@ function redirect($url)
message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
}
- $server_protocol = (isset($_SERVER['HTTPS']) || $board_config['cookie_secure']) ? 'https://' : 'http://';
+ $server_protocol = (isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure']) ? 'https://' : 'http://';
$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2008-11-24 6:14 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 11+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-11-24 6:14 UTC (permalink / raw
To: gentoo-commits
robbat2 08/11/24 06:14:23
Modified: functions.php
Log:
Document the HTTP_FRONT_END_HTTPS trick for the next fool to wonder around the codebase.
Revision Changes Path
1.25 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.24&r2=1.25
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -p -w -b -B -u -u -r1.24 -r1.25
--- functions.php 24 Nov 2008 06:09:44 -0000 1.24
+++ functions.php 24 Nov 2008 06:14:23 -0000 1.25
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.24 2008/11/24 06:09:44 robbat2 Exp $
+ * $Id: functions.php,v 1.25 2008/11/24 06:14:23 robbat2 Exp $
*
*
***************************************************************************/
@@ -1066,7 +1066,13 @@ function redirect($url)
message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.');
}
- $server_protocol = (isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure']) ? 'https://' : 'http://';
+ // If running phpBB on Apache behind a Squid reverse proxy that provides
+ // the HTTPS, you need to use "cache_peer ... front-end-https" in Squid,
+ // as well as check the HTTP_FRONT_END_HTTPS variable inside PHP to
+ // safely detect HTTPS.
+ // robbat2@gentoo.org <November 23, 2008>
+ $server_secure = isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure'];
+ $server_protocol = ($server_secure) ? 'https://' : 'http://';
$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2009-08-19 17:41 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 11+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-08-19 17:41 UTC (permalink / raw
To: gentoo-commits
robbat2 09/08/19 17:41:37
Modified: functions.php
Log:
Stop touching the database for rand_seed, and now NEVER repeat random ids.
Revision Changes Path
1.27 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.26&r2=1.27
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -p -w -b -B -u -u -r1.26 -r1.27
--- functions.php 30 Jul 2009 06:38:50 -0000 1.26
+++ functions.php 19 Aug 2009 17:41:37 -0000 1.27
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.26 2009/07/30 06:38:50 desultory Exp $
+ * $Id: functions.php,v 1.27 2009/08/19 17:41:37 robbat2 Exp $
*
*
***************************************************************************/
@@ -146,30 +146,30 @@ function phpbb_rtrim($str, $charlist = f
* The board wide setting is updated once per page if this code is called
* With thanks to Anthrax101 for the inspiration on this one
* Added in phpBB 2.0.20
+*
+* 2009-08-19 robbat2: PRNG improvements
+* - completely modify it to NOT touch the database and return a much better grade of random
+* - carry out local PRNG state in $dss_seeded.
+* - reseed sometimes
*/
function dss_rand()
{
- global $db, $board_config, $dss_seeded;
-
- $val = $board_config['rand_seed'] . microtime();
- $val = md5($val);
- $board_config['rand_seed'] = md5($board_config['rand_seed'] . $val . 'a');
-
- if($dss_seeded !== true)
- {
- $sql = "UPDATE " . CONFIG_TABLE . " SET
- config_value = '" . $board_config['rand_seed'] . "'
- WHERE config_name = 'rand_seed'";
+ global $dss_seeded;
- if( !$db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql);
+ $need_reseed = false;
+ // Trigger reseeding approximately every 1K calls
+ if(rand() % 1024 == 1) {
+ $need_reseed = true;
}
- $dss_seeded = true;
+ // When we are not seeded, grab some kernel entropy.
+ if($dss_seeded === false || $need_reseed === true) {
+ $dss_seeded .= file_get_contents('/dev/urandom', FILE_BINARY, NULL, 0, 8);
}
- return substr($val, 4, 16);
+ $dss_seeded = md5(microtime() . posix_getpid() . $_SERVER['REQUEST_TIME'] . $_SERVER['UNIQUE_ID'] . $dss_seeded);
+
+ return substr($dss_seeded, 4, 16);
}
//
// Get Userdata, $user can be username or user_id. If force_str is true, the username will be forced.
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2010-09-09 20:29 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2010-09-09 20:29 UTC (permalink / raw
To: gentoo-commits
tomk 10/09/09 20:29:19
Modified: functions.php
Log:
add microseconds to syslog timestamp
Revision Changes Path
1.29 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.28&r2=1.29
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- functions.php 8 Sep 2010 10:42:03 -0000 1.28
+++ functions.php 9 Sep 2010 20:29:19 -0000 1.29
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.28 2010/09/08 10:42:03 tomk Exp $
+ * $Id: functions.php,v 1.29 2010/09/09 20:29:19 tomk Exp $
*
*
***************************************************************************/
@@ -1169,7 +1169,7 @@
$message .= (empty($_SERVER['PHP_AUTH_USER']) ? "-" : $_SERVER['PHP_AUTH_USER']) . " ";
// timestamp - [day/month/year:hour:minute:second zone]
- $message .= date("[d/M/Y:G:i:s O]") . " ";
+ $message .= date("[d/M/Y:G:i:s.u O]") . " ";
// request
$message .= "\"" . $_SERVER['REQUEST_METHOD'] . " " . $_SERVER['REQUEST_URI'] . " " . $_SERVER['SERVER_PROTOCOL'] . "\" ";
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2010-09-09 22:18 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2010-09-09 22:18 UTC (permalink / raw
To: gentoo-commits
tomk 10/09/09 22:18:32
Modified: functions.php
Log:
'u' microsecond date format doesn't work as expected with date() so get micros separately
Revision Changes Path
1.30 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.29&r2=1.30
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- functions.php 9 Sep 2010 20:29:19 -0000 1.29
+++ functions.php 9 Sep 2010 22:18:32 -0000 1.30
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.29 2010/09/09 20:29:19 tomk Exp $
+ * $Id: functions.php,v 1.30 2010/09/09 22:18:32 tomk Exp $
*
*
***************************************************************************/
@@ -1168,8 +1168,10 @@
// auth user
$message .= (empty($_SERVER['PHP_AUTH_USER']) ? "-" : $_SERVER['PHP_AUTH_USER']) . " ";
- // timestamp - [day/month/year:hour:minute:second zone]
- $message .= date("[d/M/Y:G:i:s.u O]") . " ";
+ // timestamp - [day/month/year:hour:minute:second.micro zone]
+ // 'u' microsecond date format doesn't work as expected with date() so get micros separately
+ list($usec, $sec) = explode(' ', microtime());
+ $message .= date("[d/M/Y:G:i:s", $sec) . substr($usec, 1, 7) . date(" O]", $sec) . " ";
// request
$message .= "\"" . $_SERVER['REQUEST_METHOD'] . " " . $_SERVER['REQUEST_URI'] . " " . $_SERVER['SERVER_PROTOCOL'] . "\" ";
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2010-10-05 14:30 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2010-10-05 14:30 UTC (permalink / raw
To: gentoo-commits
tomk 10/10/05 14:30:36
Modified: functions.php
Log:
incorrect year in comments
Revision Changes Path
1.31 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.30&r2=1.31
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- functions.php 9 Sep 2010 22:18:32 -0000 1.30
+++ functions.php 5 Oct 2010 14:30:36 -0000 1.31
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.30 2010/09/09 22:18:32 tomk Exp $
+ * $Id: functions.php,v 1.31 2010/10/05 14:30:36 tomk Exp $
*
*
***************************************************************************/
@@ -558,7 +558,7 @@
return $row;
}
-// 2005-01-15 tomk - Added CIDR format compatability
+// 2006-01-15 tomk - Added CIDR format compatability
function encode_ip($dotquad_ip)
{
$slash_idx = strpos($dotquad_ip, '/');
@@ -574,7 +574,7 @@
return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]) . $slash;
}
-// 2005-01-15 tomk - Added CIDR format compatability
+// 2006-01-15 tomk - Added CIDR format compatability
function decode_ip($int_ip)
{
$slash_idx = strpos($int_ip, '/');
@@ -590,7 +590,7 @@
return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]) . $slash;
}
-// 2005-01-15 tomk - Function to convert CIDR IP addresses into binary
+// 2006-01-15 tomk - Function to convert CIDR IP addresses into binary
function dec2bin_ip($dotquad_ip, $slash = 32)
{
$ip_sep = explode('.', $dotquad_ip);
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2011-11-30 10:33 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2011-11-30 10:33 UTC (permalink / raw
To: gentoo-commits
tomk 11/11/30 10:33:44
Modified: functions.php
Log:
Make piwik site id configurable
Revision Changes Path
1.33 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.32&r2=1.33
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- functions.php 27 Nov 2011 14:42:56 -0000 1.32
+++ functions.php 30 Nov 2011 10:33:44 -0000 1.33
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.32 2011/11/27 14:42:56 tomk Exp $
+ * $Id: functions.php,v 1.33 2011/11/30 10:33:44 tomk Exp $
*
*
***************************************************************************/
@@ -1194,7 +1194,7 @@
$piwik_code = "";
- if (isset($board_config['enable_piwik']) && !empty($board_config['enable_piwik'] == '1')) {
+ if (isset($board_config['enable_piwik']) && $board_config['enable_piwik'] == '1' && intval($board_config['piwik_site_id']) > 0) {
$piwik_code = <<<EOD
<!-- Piwik -->
<script type="text/javascript">
@@ -1202,11 +1202,11 @@
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
</script><script type="text/javascript">
try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3);
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $board_config['piwik_site_id']);
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
-</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite=3" style="border:0" alt="" /></p></noscript>
+</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite=" . $board_config['piwik_site_id'] style="border:0" alt="" /></p></noscript>
<!-- End Piwik Tracking Code -->
EOD;
}
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2011-12-01 9:59 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2011-12-01 9:59 UTC (permalink / raw
To: gentoo-commits
tomk 11/12/01 09:59:17
Modified: functions.php
Log:
prevent php parse error
Revision Changes Path
1.34 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.33&r2=1.34
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- functions.php 30 Nov 2011 10:33:44 -0000 1.33
+++ functions.php 1 Dec 2011 09:59:17 -0000 1.34
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.33 2011/11/30 10:33:44 tomk Exp $
+ * $Id: functions.php,v 1.34 2011/12/01 09:59:17 tomk Exp $
*
*
***************************************************************************/
@@ -1202,11 +1202,11 @@
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
</script><script type="text/javascript">
try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $board_config['piwik_site_id']);
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$board_config['piwik_site_id']});
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
-</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite=" . $board_config['piwik_site_id'] style="border:0" alt="" /></p></noscript>
+</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite={$board_config['piwik_site_id']}" style="border:0" alt="" /></p></noscript>
<!-- End Piwik Tracking Code -->
EOD;
}
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2012-03-12 22:58 Tom Knight (tomk)
0 siblings, 0 replies; 11+ messages in thread
From: Tom Knight (tomk) @ 2012-03-12 22:58 UTC (permalink / raw
To: gentoo-commits
tomk 12/03/12 22:58:40
Modified: functions.php
Log:
prevent piwik mixed content warnings when using https with javascript disabled
Revision Changes Path
1.35 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.34&r2=1.35
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- functions.php 1 Dec 2011 09:59:17 -0000 1.34
+++ functions.php 12 Mar 2012 22:58:40 -0000 1.35
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.34 2011/12/01 09:59:17 tomk Exp $
+ * $Id: functions.php,v 1.35 2012/03/12 22:58:40 tomk Exp $
*
*
***************************************************************************/
@@ -1206,7 +1206,7 @@
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
-</script><noscript><p><img src="http://piwik.gentoo.org/piwik.php?idsite={$board_config['piwik_site_id']}" style="border:0" alt="" /></p></noscript>
+</script><noscript><p><img src="/1x1.gif" style="border:0" alt="" /></p></noscript>
<!-- End Piwik Tracking Code -->
EOD;
}
^ permalink raw reply [flat|nested] 11+ messages in thread* [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php
@ 2012-09-07 3:12 Dean Stephens (desultory)
0 siblings, 0 replies; 11+ messages in thread
From: Dean Stephens (desultory) @ 2012-09-07 3:12 UTC (permalink / raw
To: gentoo-commits
desultory 12/09/07 03:12:09
Modified: functions.php
Log:
Explicitly disallow caching of redirections
Revision Changes Path
1.36 forums/htdocs/includes/functions.php
file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions.php?r1=1.35&r2=1.36
Index: functions.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- functions.php 12 Mar 2012 22:58:40 -0000 1.35
+++ functions.php 7 Sep 2012 03:12:09 -0000 1.36
@@ -7,7 +7,7 @@
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
- * $Id: functions.php,v 1.35 2012/03/12 22:58:40 tomk Exp $
+ * $Id: functions.php,v 1.36 2012/09/07 03:12:09 desultory Exp $
*
*
***************************************************************************/
@@ -1089,6 +1089,7 @@
// Behave as per HTTP/1.1 spec for others
header('Location: ' . $server_protocol . $server_name . $server_port . $script_name . $url);
+ header('Cache-Control: no-cache');
exit;
}
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-09-07 3:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-09 11:08 [gentoo-commits] gentoo-projects commit in forums/htdocs/includes: functions.php Tom Knight,,, (tomk)
-- strict thread matches above, loose matches on Subject: below --
2008-11-24 6:09 Robin H. Johnson (robbat2)
2008-11-24 6:14 Robin H. Johnson (robbat2)
2009-08-19 17:41 Robin H. Johnson (robbat2)
2010-09-09 20:29 Tom Knight (tomk)
2010-09-09 22:18 Tom Knight (tomk)
2010-10-05 14:30 Tom Knight (tomk)
2011-11-30 10:33 Tom Knight (tomk)
2011-12-01 9:59 Tom Knight (tomk)
2012-03-12 22:58 Tom Knight (tomk)
2012-09-07 3:12 Dean Stephens (desultory)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox