summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/tests/File_Structure_Test.php7
-rw-r--r--modules/gallery/tests/xss_data.txt2
-rw-r--r--modules/gallery/views/form_uploadify.html.php2
3 files changed, 6 insertions, 5 deletions
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index f46d9d64..e42f7dcd 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -175,9 +175,10 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
// Front controllers
break;
- case DOCROOT . "lib/uploadify/uploadify.php":
- case DOCROOT . "lib/uploadify/uploadify.allglyphs.php":
- // Uploadify wrappers - directly accessible
+ case DOCROOT . "lib/uploadify/uploadify.swf.php":
+ case DOCROOT . "lib/uploadify/uploadify.allglyphs.swf.php":
+ case DOCROOT . "lib/mediaelementjs/flashmediaelement.swf.php":
+ // SWF wrappers - directly accessible
break;
case DOCROOT . "local.php":
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 8504de3a..b15227d2 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -180,7 +180,7 @@ modules/gallery/views/error_admin.html.php 286 DIRTY_ATTR $env
modules/gallery/views/error_admin.html.php 296 DIRTY Kohana_Exception::safe_dump($value,$key)
modules/gallery/views/form_uploadify.html.php 16 DIRTY_JS url::site("uploader/status/_S/_E")
modules/gallery/views/form_uploadify.html.php 24 DIRTY_JS $flash_minimum_version
-modules/gallery/views/form_uploadify.html.php 28 DIRTY_JS url::file("lib/uploadify/uploadify.php")
+modules/gallery/views/form_uploadify.html.php 28 DIRTY_JS url::file("lib/uploadify/uploadify.swf.php")
modules/gallery/views/form_uploadify.html.php 29 DIRTY_JS url::site("uploader/add_photo/{$album->id}")
modules/gallery/views/form_uploadify.html.php 31 DIRTY_JS implode(";",$extensions)
modules/gallery/views/form_uploadify.html.php 33 DIRTY_JS url::file("lib/uploadify/cancel.png")
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 4963d185..bba6db73 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -25,7 +25,7 @@
$("#g-uploadify").uploadify({
width: 298,
height: 32,
- uploader: "<?= url::file("lib/uploadify/uploadify.php") ?>",
+ uploader: "<?= url::file("lib/uploadify/uploadify.swf.php") ?>",
script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
scriptData: <?= json_encode($script_data) ?>,
fileExt: "<?= implode(";", $extensions) ?>",