t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

session IP mask, for users with varying IPs; mostly from a patch in #303

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@779 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish
2008-04-08 16:02:43 +00:00
parent fba18e10fc
commit c88a35b58c
5 changed files with 112 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/util.inc.php
View File

@@ -199,6 +199,21 @@ function get_memory_limit() {
return $memory;
}
function get_session_ip() {
global $config;
$mask = $config->get_string("session_hash_mask");
if(!$mask) {
$config->set_string("session_hash_mask", "255.255.0.0");
$mask = "255.255.0.0";
}
$addr = $_SERVER['REMOTE_ADDR'];
$addr = inet_ntop(inet_pton($addr) & inet_pton($mask));
return $addr;
}
/*
* PHP really, really sucks.
*/
@@ -317,39 +332,6 @@ function array_contains($array, $target) {
return false;
}
# (PHP 5 >= 5.2.1)
if(!function_exists('sys_get_temp_dir')) {
// Based on http://www.phpit.net/
// article/creating-zip-tar-archives-dynamically-php/2/
function sys_get_temp_dir() {
// Try to get from environment variable
if(!empty($_ENV['TMP'])) {
return realpath($_ENV['TMP']);
}
else if(!empty($_ENV['TMPDIR'])) {
return realpath($_ENV['TMPDIR']);
}
else if(!empty($_ENV['TEMP'])) {
return realpath($_ENV['TEMP']);
}
// Detect by creating a temporary file
else {
// Try to use system's temporary directory
// as random name shouldn't exist
$temp_file = tempnam(md5(uniqid(rand(), TRUE)), '');
if($temp_file) {
$temp_dir = realpath(dirname($temp_file));
unlink($temp_file);
return $temp_dir;
}
else {
return FALSE;
}
}
}
}
// from http://uk.php.net/network
function ip_in_range($IP, $CIDR) {
list ($net, $mask) = split ("/", $CIDR);