aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/event_tracer/event_list.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-10-16 00:38:26 +0000
committerrvelices <rv-github@modusoptimus.com>2008-10-16 00:38:26 +0000
commitebc3c2e2f7d9408db7e5335d63fdd2a003c3d79a (patch)
treed2b00fb200eab5f807b6eac33e8e692031227a1b /plugins/event_tracer/event_list.php
parenteb667c7711d61d0c757f2202af6c2e61cba7d1ac (diff)
merge 2755 and 2756 from branch 2.0 to trunk
- 2755 fix vulnerability http://www.milw0rm.com/exploits/6755 - 2756 security paranoia: protect session/remember me cookies from XSS attacks (works only if php>=5.2 and with IE/FF maybe others) git-svn-id: http://piwigo.org/svn/trunk@2757 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins/event_tracer/event_list.php')
-rw-r--r--plugins/event_tracer/event_list.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/event_tracer/event_list.php b/plugins/event_tracer/event_list.php
index ae617fe87..1cde14ef3 100644
--- a/plugins/event_tracer/event_list.php
+++ b/plugins/event_tracer/event_list.php
@@ -16,7 +16,7 @@ function get_php_files($path, $to_ignore=array(), $recursive=true )
if ( $recursive and is_dir($path.'/'.$node) )
{
$files = array_merge($files, get_php_files($path.'/'.$node, $to_ignore));
-
+
}
if ( is_file($path.'/'.$node) )
{
@@ -43,7 +43,7 @@ foreach ($files as $file)
$code = preg_replace( '#\?'.'>.*<\?php#m', '', $code);
$code = preg_replace( '#\/\*.*\*\/#m', '', $code);
$code = preg_replace( '#\/\/.*#', '', $code);
-
+
$count = preg_match_all(
'#[^a-zA-Z_$-]trigger_(action|event)\s*\(\s*([^,)]+)#m',
$code, $matches
@@ -57,7 +57,7 @@ foreach ($files as $file)
}
}
-$sort= isset($_GET['sort']) ? $_GET['sort'] : 1;
+$sort= isset($_GET['sort']) ? (int)$_GET['sort'] : 1;
usort(
$events,
create_function( '$a,$b', 'return $a['.$sort.']>$b['.$sort.'];' )