Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
X Lib
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
XLibs
X Lib
Commits
5fbcc180
Commit
5fbcc180
authored
Jun 29, 2016
by
Alex Ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
поправка обработки сессии
parent
7be04c17
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
27 deletions
+28
-27
Session.php
Accounting/Session.php
+7
-5
EItem.php
ETrace/EItem.php
+21
-22
No files found.
Accounting/Session.php
View file @
5fbcc180
...
...
@@ -63,11 +63,13 @@ class Session extends \X\Security\Crypto\IDEA {
$this
->
session
=
$In
->
CookieValue
(
$this
->
session_name
,
false
)
?:
$In
->
Request
(
$this
->
session_name
,
""
)
->
string
();
if
(
strlen
(
$this
->
session
)
>
0
)
{
if
(
is_array
(
$session_data
=
$this
->
explode
(
gzuncompress
(
$this
->
decrypt_b64
(
$this
->
session
)))))
{
if
(
isset
(
$session_data
[
"cs"
])
&&
$session_data
[
"cs"
]
==
$this
->
crypto_checksum
(
$session_data
))
{
$this
->
session_data
=
$session_data
;
return
true
;
}
else
{
throw
new
SessionChecksumError
(
"Checksum Error"
,
[
get_defined_vars
(),
$this
]);
if
(
isset
(
$session_data
[
"cs"
]))
{
if
(
$session_data
[
"cs"
]
==
$this
->
crypto_checksum
(
$session_data
))
{
$this
->
session_data
=
$session_data
;
return
true
;
}
else
{
throw
new
SessionChecksumError
(
"Checksum Error"
,
[
get_defined_vars
(),
$this
]);
}
}
}
}
...
...
ETrace/EItem.php
View file @
5fbcc180
...
...
@@ -4,8 +4,7 @@ namespace X\ETrace;
/**
*
*/
class
EItem
extends
\Exception
{
class
EItem
extends
\Exception
{
/**
* @var int
*/
...
...
@@ -31,16 +30,13 @@ class EItem extends \Exception
/**
* @return mixed
*/
public
function
__construct
(
$type
,
$message
,
$code
=
0
,
$file
=
false
,
$line
=
false
,
$context
=
[])
{
public
function
__construct
(
$type
,
$message
,
$code
=
0
,
$file
=
false
,
$line
=
false
,
$context
=
[])
{
parent
::
__construct
(
$message
,
$code
);
if
(
!
(
$file
===
false
))
{
if
(
!
(
$file
===
false
))
{
$this
->
file
=
$file
;
}
if
(
!
(
$line
===
false
))
{
if
(
!
(
$line
===
false
))
{
$this
->
line
=
$line
;
}
...
...
@@ -48,29 +44,35 @@ class EItem extends \Exception
$this
->
hash
=
$this
->
calcHash
();
}
public
function
__debugInfo
()
{
/**
* @return mixed
*/
public
function
__debugInfo
()
{
return
$this
->
Model
();
}
/**
* @return mixed
*/
public
function
Trace
()
{
public
function
Trace
()
{
return
$this
->
getTrace
();
}
/**
* @return mixed
*/
public
function
Serialize
()
{
public
function
getContext
()
{
return
$this
->
context
;
}
/**
* @return mixed
*/
public
function
Serialize
()
{
return
serialize
(
$this
->
Model
());
}
public
function
Model
()
{
public
function
Model
()
{
return
[
"hash"
=>
$this
->
hash
,
...
...
@@ -85,21 +87,18 @@ class EItem extends \Exception
];
}
public
function
increment
()
{
public
function
increment
()
{
$this
->
count
++
;
}
/**
* @return hex
*/
public
function
getHash
()
{
public
function
getHash
()
{
return
$this
->
hash
;
}
private
function
calcHash
()
{
private
function
calcHash
()
{
return
md5
(
serialize
([
$this
->
message
,
$this
->
code
,
$this
->
file
,
$this
->
line
,
$this
->
Trace
()]));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment