aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-02-26 20:12:27 +0000
committerplegall <plg@piwigo.org>2009-02-26 20:12:27 +0000
commit1d034894d99813b00cc564dd93f0057ea84f8694 (patch)
treeaaf6c89f70a7ee87d0aa68d01ea1da74971d73bf /include
parent3e78ded63a1250747ed2acaf54d44d14c9bd3e35 (diff)
merge r3165 from branch 2.0 to trunk
bug 913 fixed: ability to connect with an IPv6 address was added. git-svn-id: http://piwigo.org/svn/trunk@3166 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_session.inc.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index a15491193..1145d3dcc 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -93,7 +93,15 @@ function pwg_session_close()
function get_remote_addr_session_hash()
{
- return vsprintf( "%02X%02X", explode('.',$_SERVER['REMOTE_ADDR']) );
+ $separator = (FALSE === strpos($_SERVER['REMOTE_ADDR'],'.'))
+ ? ':'
+ : '.'
+ ;
+
+ return vsprintf(
+ "%02X%02X",
+ explode($separator,$_SERVER['REMOTE_ADDR'])
+ );
}
/**
@@ -217,4 +225,4 @@ function pwg_unset_session_var($var)
return true;
}
-?> \ No newline at end of file
+?>