From 9b1c6ab14f8a7c6024795d213f55ea31ac77c480 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 14 Apr 2013 00:28:29 -0400
Subject: Golden file update follow-on for
 c37288f0b24c19813405096c087ab0c7c171c358

---
 modules/gallery/tests/xss_data.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 2152858a..d3d96878 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -177,7 +177,6 @@ modules/gallery/views/error_admin.html.php                   284 DIRTY_ATTR $env
 modules/gallery/views/error_admin.html.php                   285 DIRTY_JS $env_id
 modules/gallery/views/error_admin.html.php                   285 DIRTY    $var
 modules/gallery/views/error_admin.html.php                   286 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   292 DIRTY    $key
 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
-- 
cgit v1.2.3


From e4a3abdd207cce37c4f71ed87d0c420ec8539775 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 9 May 2013 20:04:01 -0400
Subject: Change upload code to use new uploadify urls.

---
 modules/gallery/tests/xss_data.txt            | 2 +-
 modules/gallery/views/form_uploadify.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index d3d96878..8504de3a 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.swf")
+modules/gallery/views/form_uploadify.html.php                28  DIRTY_JS url::file("lib/uploadify/uploadify.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 c13e3418..4963d185 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.swf") ?>",
+        uploader: "<?= url::file("lib/uploadify/uploadify.php") ?>",
         script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
         scriptData: <?= json_encode($script_data) ?>,
         fileExt: "<?= implode(";", $extensions) ?>",
-- 
cgit v1.2.3


From b6ad4157d1aae5849ad5608b90c62f1acf22e1a9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 9 May 2013 20:09:15 -0400
Subject: Get rid of the security preamble - we intend for these files to be
 directly accessible.

---
 lib/uploadify/uploadify.allglyphs.php         | 2 +-
 lib/uploadify/uploadify.php                   | 2 +-
 modules/gallery/tests/File_Structure_Test.php | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/lib/uploadify/uploadify.allglyphs.php b/lib/uploadify/uploadify.allglyphs.php
index e784b9b0..18b75a50 100644
--- a/lib/uploadify/uploadify.allglyphs.php
+++ b/lib/uploadify/uploadify.allglyphs.php
@@ -1,4 +1,4 @@
-<?php defined("SYSPATH") or die("No direct script access.");
+<?php
 /**
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2013 Bharat Mediratta
diff --git a/lib/uploadify/uploadify.php b/lib/uploadify/uploadify.php
index 93001a8b..471405b6 100644
--- a/lib/uploadify/uploadify.php
+++ b/lib/uploadify/uploadify.php
@@ -1,4 +1,4 @@
-<?php defined("SYSPATH") or die("No direct script access.");
+<?php
 /**
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2013 Bharat Mediratta
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index ce75ea13..f46d9d64 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -175,6 +175,11 @@ 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
+        break;
+
       case DOCROOT . "local.php":
         // Special case optional file, not part of the codebase
         break;
-- 
cgit v1.2.3