aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2008-10-16 19:34:46 +0000
committerplegall <plg@piwigo.org>2008-10-16 19:34:46 +0000
commit4411169d1aa5e477c33794d213394bca591a43a3 (patch)
tree931f640ef0b6adcebdec7aec7503b56e9fd2af8d /plugins
parent9598532f6734864fbf9112711cbd64d901361666 (diff)
merge -c2755 from branch 2.0 to branch 1.7
- fix vulnerability http://www.milw0rm.com/exploits/6755 git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2762 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins')
-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 1f1969629..6af136464 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.'];' )